Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353117 )
Change subject: site.pp: consistent quoting for role names
......................................................................
site.pp: consistent quoting for role names
Change-Id: I7c267e233d5a93fd4178ec180ba5a158f2b8ea7e
---
M manifests/site.pp
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index a88df60..de9a00e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -187,7 +187,7 @@
# VM with webserver for misc. static sites
node 'bromine.eqiad.wmnet' {
- role('webserver_misc_static')
+ role(webserver_misc_static)
}
# Californium hosts openstack-dashboard AKA horizon
@@ -218,7 +218,7 @@
# All gerrit servers (swap master status in hiera)
node 'cobalt.wikimedia.org', 'gerrit2001.wikimedia.org' {
- role('gerrit::server')
+ role(gerrit::server)
interface::add_ip6_mapped { 'main': }
}
@@ -2332,7 +2332,7 @@
# virtual machines hosting
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
node /^planet[12]001\.(eqiad|codfw)\.wmnet$/ {
- role('planet_server')
+ role(planet_server)
}
# LDAP servers relied on by OIT for mail
@@ -2401,7 +2401,7 @@
# Tor relay
node 'radium.wikimedia.org' {
- role('tor_relay')
+ role(tor_relay)
}
node 'radon.wikimedia.org' {
@@ -2662,7 +2662,7 @@
# mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
node 'terbium.eqiad.wmnet', 'wasat.codfw.wmnet' {
- role('mediawiki_maintenance')
+ role(mediawiki_maintenance)
}
# Thumbor servers for MediaWiki image scaling
@@ -2685,7 +2685,7 @@
# replaced magnesium (RT) (T119112 T123713)
node 'ununpentium.wikimedia.org' {
- role('requesttracker_server')
+ role(requesttracker_server)
}
# Ganglia Web UI
@@ -2734,7 +2734,6 @@
# T138650 - tools for the security team
node 'zosma.codfw.wmnet' {
role(security::tools)
-
interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
--
To view, visit https://gerrit.wikimedia.org/r/353117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c267e233d5a93fd4178ec180ba5a158f2b8ea7e
Gerrit-PatchSet: 2
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
