Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: snapshot: fixup for I1863679d and Icc9aba2
......................................................................
snapshot: fixup for I1863679d and Icc9aba2
Change-Id: Ibd93b2d261e95a2fb5ceb7642195704cafc4aaf7
---
M hieradata/role/common/snapshot/common.yaml
M manifests/role/snapshot.pp
M manifests/site.pp
3 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/snapshot/common.yaml
b/hieradata/role/common/snapshot/common.yaml
index 8ddbb27..d65cd67 100644
--- a/hieradata/role/common/snapshot/common.yaml
+++ b/hieradata/role/common/snapshot/common.yaml
@@ -1,3 +1,4 @@
admin::groups:
- udp2log-users
- deployment
+ - snapshot-admins
diff --git a/manifests/role/snapshot.pp b/manifests/role/snapshot.pp
index 3d27362..d0de703 100644
--- a/manifests/role/snapshot.pp
+++ b/manifests/role/snapshot.pp
@@ -1,5 +1,4 @@
class role::snapshot::common {
- class { 'admin': groups => ['snapshot-admins'] }
include role::dataset::systemusers
# The snapshot nodes do not include standard, so this is needed.
# It also includes some duplication with other modules, and should really
go away.
diff --git a/manifests/site.pp b/manifests/site.pp
index 0b16673..e5ab96f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2384,6 +2384,7 @@
node /^snapshot100[1-4]\.eqiad\.wmnet/ {
role snapshot::common
+ include admin
include snapshot
include snapshot::dumps
if $::fqdn == 'snapshot1003.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/202406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd93b2d261e95a2fb5ceb7642195704cafc4aaf7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
