Dzahn has submitted this change and it was merged.

Change subject: ytterbium, have group wikidev, include accounts then do all the 
rest (sudo user), attempt to avoid dependency problem for Group[500]
......................................................................


ytterbium, have group wikidev, include accounts then do all the rest (sudo 
user),
attempt to avoid dependency problem for Group[500]

Change-Id: I1825be96e37408f6f41249cbfb7a253f8ed490de
---
M manifests/site.pp
1 file changed, 8 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 420a9c1..2a2a9c2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2969,6 +2969,14 @@
 }
 
 node "ytterbium.wikimedia.org" {
+
+    # Note: whenever moving Gerrit out of manganese, you will need
+    # to update the role::zuul::production
+    include role::gerrit::production,
+        backup::client,
+        groups::wikidev,
+        accounts::demon
+
     install_certificate{ "gerrit.wikimedia.org": ca => "RapidSSL_CA.pem" }
 
     $sudo_privs = [ 'ALL = NOPASSWD: /usr/local/sbin/add-ldap-user',
@@ -2981,12 +2989,6 @@
 
     # full root for gerrit admin (RT-3698)
     sudo_user { "demon": privileges => ['ALL = NOPASSWD: ALL'] }
-
-    # Note: whenever moving Gerrit out of manganese, you will need
-    # to update the role::zuul::production
-    include role::gerrit::production,
-        backup::client,
-        accounts::demon
 }
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1825be96e37408f6f41249cbfb7a253f8ed490de
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to