[MediaWiki-commits] [Gerrit] operations/puppet[production]: aqs: use the canonical definition of logstash host

2017-12-21 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399624 )

Change subject: aqs: use the canonical definition of logstash host
..


aqs: use the canonical definition of logstash host

Bug: T182304
Change-Id: I5aec6c6d44c253986576676309da7b3bece67e77
---
M hieradata/role/common/aqs.yaml
M modules/profile/manifests/aqs.pp
2 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Elukey: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index f825bd7..5ad96c5 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -105,7 +105,6 @@
 - aqs1008-b.eqiad.wmnet
 - aqs1009-a.eqiad.wmnet
 - aqs1009-b.eqiad.wmnet
-profile::aqs::logstash_host: logstash.svc.eqiad.wmnet
 profile::aqs::cassandra_default_consistency: localQuorum
 profile::aqs::cassandra_local_dc: "%{::site}"
 profile::aqs::statsd_host: statsd.eqiad.wmnet
diff --git a/modules/profile/manifests/aqs.pp b/modules/profile/manifests/aqs.pp
index 262034e..07092e2 100644
--- a/modules/profile/manifests/aqs.pp
+++ b/modules/profile/manifests/aqs.pp
@@ -9,7 +9,7 @@
 $cassandra_user= hiera('profile::aqs::cassandra_user'),
 $cassandra_password= 
hiera('profile::aqs::cassandra_password'),
 $cassandra_seeds   = hiera('profile::aqs::seeds'),
-$logstash_host = hiera('profile::aqs::logstash_host'),
+$logstash_host = hiera('logstash_host'),
 $cassandra_default_consistency = 
hiera('profile::aqs::cassandra_default_consistency'),
 $cassandra_local_dc= 
hiera('profile::aqs::cassandra_local_dc'),
 $statsd_host   = hiera('profile::aqs::statsd_host'),

-- 
To view, visit https://gerrit.wikimedia.org/r/399624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5aec6c6d44c253986576676309da7b3bece67e77
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aqs: use the canonical definition of logstash host

2017-12-21 Thread Gehel (Code Review) 
Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399624 )

Change subject: aqs: use the canonical definition of logstash host
..

aqs: use the canonical definition of logstash host

Bug: T182304
Change-Id: I5aec6c6d44c253986576676309da7b3bece67e77
---
M hieradata/role/common/aqs.yaml
M modules/profile/manifests/aqs.pp
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/399624/1

diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index f825bd7..5ad96c5 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -105,7 +105,6 @@
 - aqs1008-b.eqiad.wmnet
 - aqs1009-a.eqiad.wmnet
 - aqs1009-b.eqiad.wmnet
-profile::aqs::logstash_host: logstash.svc.eqiad.wmnet
 profile::aqs::cassandra_default_consistency: localQuorum
 profile::aqs::cassandra_local_dc: "%{::site}"
 profile::aqs::statsd_host: statsd.eqiad.wmnet
diff --git a/modules/profile/manifests/aqs.pp b/modules/profile/manifests/aqs.pp
index 262034e..07092e2 100644
--- a/modules/profile/manifests/aqs.pp
+++ b/modules/profile/manifests/aqs.pp
@@ -9,7 +9,7 @@
 $cassandra_user= hiera('profile::aqs::cassandra_user'),
 $cassandra_password= 
hiera('profile::aqs::cassandra_password'),
 $cassandra_seeds   = hiera('profile::aqs::seeds'),
-$logstash_host = hiera('profile::aqs::logstash_host'),
+$logstash_host = hiera('logstash_host'),
 $cassandra_default_consistency = 
hiera('profile::aqs::cassandra_default_consistency'),
 $cassandra_local_dc= 
hiera('profile::aqs::cassandra_local_dc'),
 $statsd_host   = hiera('profile::aqs::statsd_host'),

-- 
To view, visit https://gerrit.wikimedia.org/r/399624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aec6c6d44c253986576676309da7b3bece67e77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits