Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393994 )

Change subject: mwlog/xenon: access should be based on role, not host names
......................................................................


mwlog/xenon: access should be based on role, not host names

Change-Id: Iafba9f6a1b08875a718bfd847f54a68c72f36bbc
---
M hieradata/hosts/mwlog1001.yaml
M hieradata/hosts/mwlog2001.yaml
M hieradata/role/common/logging/mediawiki/udp2log.yaml
3 files changed, 4 insertions(+), 8 deletions(-)

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



diff --git a/hieradata/hosts/mwlog1001.yaml b/hieradata/hosts/mwlog1001.yaml
index 2c5d68a..372017c 100644
--- a/hieradata/hosts/mwlog1001.yaml
+++ b/hieradata/hosts/mwlog1001.yaml
@@ -1,7 +1,3 @@
-admin::groups:
-  - deployment
-  - restricted
-  - mw-log-readers
 role::logging::mediawiki::udp2log::rsync_slow_parse: true
 role::logging::mediawiki::udp2log::forward_messages: true
 role::logging::mediawiki::udp2log::monitor: false
diff --git a/hieradata/hosts/mwlog2001.yaml b/hieradata/hosts/mwlog2001.yaml
index c899747..725dbe6 100644
--- a/hieradata/hosts/mwlog2001.yaml
+++ b/hieradata/hosts/mwlog2001.yaml
@@ -1,7 +1,3 @@
-admin::groups:
-  - deployment
-  - restricted
-  - mw-log-readers
 role::logging::mediawiki::udp2log::rsync_slow_parse: false
 role::logging::mediawiki::udp2log::forward_messages: false
 role::logging::mediawiki::udp2log::monitor: false
diff --git a/hieradata/role/common/logging/mediawiki/udp2log.yaml 
b/hieradata/role/common/logging/mediawiki/udp2log.yaml
index fd7a401..c242419 100644
--- a/hieradata/role/common/logging/mediawiki/udp2log.yaml
+++ b/hieradata/role/common/logging/mediawiki/udp2log.yaml
@@ -1 +1,5 @@
 role::logging::mediawiki::udp2log::logstash_host: 'logstash.svc.eqiad.wmnet'
+admin::groups:
+  - deployment
+  - restricted
+  - mw-log-readers

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafba9f6a1b08875a718bfd847f54a68c72f36bbc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to