Cmjohnson has submitted this change and it was merged.
Change subject: reclaiming manganese -remove site.pp/add decom.pp
......................................................................
reclaiming manganese -remove site.pp/add decom.pp
Change-Id: Id2b9fff0ec524cd0506d39310a72008d54a12b9f
---
M manifests/decommissioning.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 25 deletions(-)
Approvals:
Cmjohnson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 05dd03b..6926b16 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -10,7 +10,6 @@
'bellin',
'blondel',
'br1-knams',
-'caesium', #remove after 9/5/2013
'celsus',
'cerium',
'colby',
@@ -105,6 +104,7 @@
'lardner',
'lily',
'lomaria',
+'manganese', #remove 9/7/13 or later
'mc2',
'mc3',
'mc4',
@@ -130,7 +130,6 @@
'ms3',
'ms4',
'msfe1002',
-'netmon1001', #will come back, just removing from monitoring for now -robh
2013-09-03
'niobium',
'ocg1',
'ocg2',
diff --git a/manifests/site.pp b/manifests/site.pp
index b236694..6b1f996 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1631,29 +1631,6 @@
include standard
}
-node "manganese.wikimedia.org" {
- install_certificate{ "gerrit.wikimedia.org": ca => "RapidSSL_CA.pem" }
-
- $sudo_privs = [ 'ALL = NOPASSWD: /usr/local/sbin/add-ldap-user',
- 'ALL = NOPASSWD: /usr/local/sbin/delete-ldap-user',
- 'ALL = NOPASSWD: /usr/local/sbin/modify-ldap-user',
- 'ALL = NOPASSWD: /usr/local/bin/svn-group',
- 'ALL = NOPASSWD: /usr/local/sbin/add-labs-user',
- 'ALL = NOPASSWD: /var/lib/gerrit2/review_site/bin/gerrit.sh' ]
- sudo_user { [ "robla", "reedy" ]: privileges => $sudo_privs }
-
- # full root for gerrit admin (RT-3698)
- sudo_user { "demon": privileges => ['ALL = NOPASSWD: ALL'] }
-
- $ldapincludes = ['openldap', 'nss', 'utils']
- $ssh_tcp_forwarding = "no"
- $ssh_x11_forwarding = "no"
- include role::gerrit::production::old,
- backup::client
-
- class { "ldap::role::client::labs": ldapincludes => $ldapincludes }
-}
-
node "magnesium.wikimedia.org" {
$cluster = "misc"
--
To view, visit https://gerrit.wikimedia.org/r/82849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b9fff0ec524cd0506d39310a72008d54a12b9f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
