[MediaWiki-commits] [Gerrit] operations/puppet[production]: wdqs: 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/399650 )

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


wdqs: use the canonical definition of logstash host

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

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



diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml
index f083ff8..3c91737 100644
--- a/hieradata/role/common/wdqs.yaml
+++ b/hieradata/role/common/wdqs.yaml
@@ -1,4 +1,3 @@
-profile::wdqs::logstash_host: 'logstash.svc.eqiad.wmnet'
 profile::wdqs::use_git_deploy: true
 profile::wdqs::package_dir: '/srv/deployment/wdqs/wdqs'
 profile::wdqs::data_dir: '/srv/wdqs'
diff --git a/modules/profile/manifests/wdqs.pp 
b/modules/profile/manifests/wdqs.pp
index d807d06..b9af7e4 100644
--- a/modules/profile/manifests/wdqs.pp
+++ b/modules/profile/manifests/wdqs.pp
@@ -1,5 +1,5 @@
 class profile::wdqs (
-$logstash_host = hiera('profile::wdqs::logstash_host'),
+$logstash_host = hiera('logstash_host'),
 $use_git_deploy = hiera('profile::wdqs::use_git_deploy'),
 $package_dir = hiera('profile::wdqs::package_dir'),
 $data_dir = hiera('profile::wdqs::data_dir'),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07b7dbcd847ef01d5833d80c21b100be4c5c7017
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Smalyshev 
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]: wdqs: 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/399650 )

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

wdqs: use the canonical definition of logstash host

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/399650/1

diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml
index f083ff8..3c91737 100644
--- a/hieradata/role/common/wdqs.yaml
+++ b/hieradata/role/common/wdqs.yaml
@@ -1,4 +1,3 @@
-profile::wdqs::logstash_host: 'logstash.svc.eqiad.wmnet'
 profile::wdqs::use_git_deploy: true
 profile::wdqs::package_dir: '/srv/deployment/wdqs/wdqs'
 profile::wdqs::data_dir: '/srv/wdqs'
diff --git a/modules/profile/manifests/wdqs.pp 
b/modules/profile/manifests/wdqs.pp
index d807d06..b9af7e4 100644
--- a/modules/profile/manifests/wdqs.pp
+++ b/modules/profile/manifests/wdqs.pp
@@ -1,5 +1,5 @@
 class profile::wdqs (
-$logstash_host = hiera('profile::wdqs::logstash_host'),
+$logstash_host = hiera('logstash_host'),
 $use_git_deploy = hiera('profile::wdqs::use_git_deploy'),
 $package_dir = hiera('profile::wdqs::package_dir'),
 $data_dir = hiera('profile::wdqs::data_dir'),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07b7dbcd847ef01d5833d80c21b100be4c5c7017
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