Dzahn has submitted this change and it was merged.
Change subject: remove nickel from ganglia server aliases
......................................................................
remove nickel from ganglia server aliases
nickel is not a ganglia server anymore,
uranium replaced it. remove it from ganglia
and ganglia_new server aliases
Change-Id: I7281f1c8637fc332c1448f9c6c5c18102d79b26d
RT: 7906
RT: 8770
---
M manifests/ganglia.pp
M modules/ganglia_new/manifests/web.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 2c8c960..e4681a8 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -508,7 +508,7 @@
} else {
# We are in production land
$ganglia_servername = 'ganglia.wikimedia.org'
- $ganglia_serveralias = 'nickel.wikimedia.org uranium.wikimedia.org'
+ $ganglia_serveralias = 'uranium.wikimedia.org'
#TODO: Ugly hideous hack to be removed soon after we migrate to trusty
if ubuntu_version('>= trusty') {
package { 'ganglia-webfrontend':
diff --git a/modules/ganglia_new/manifests/web.pp
b/modules/ganglia_new/manifests/web.pp
index 4fc105d..c3c8e6b 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -10,7 +10,7 @@
include ::apache::mod::rewrite
$ganglia_servername = 'ganglia.wikimedia.org'
- $ganglia_serveralias = 'nickel.wikimedia.org uranium.wikimedia.org'
+ $ganglia_serveralias = 'uranium.wikimedia.org'
$ganglia_webdir = '/usr/share/ganglia-webfrontend'
$ganglia_confdir = '/var/lib/ganglia-web'
$ganglia_ssl_cert = '/etc/ssl/certs/ganglia.wikimedia.org.pem'
--
To view, visit https://gerrit.wikimedia.org/r/173197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7281f1c8637fc332c1448f9c6c5c18102d79b26d
Gerrit-PatchSet: 1
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
