[MediaWiki-commits] [Gerrit] r::c::config: remove has_ganglia - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/275119

Change subject: r::c::config: remove has_ganglia
......................................................................

r::c::config: remove has_ganglia

This just mirrors standard::has_ganglia (even in labs!), so switch
all references to that and delete it.

Bug: T127484
Change-Id: Ic063d5dbc95be8df92fc7bdd38774b16b055040d
---
M modules/role/manifests/cache/2layer.pp
M modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
5 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/275119/1

diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 1933f4f..8934b37 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -7,7 +7,7 @@
     include role::cache::statsd::frontend
 
     # Ganglia monitoring
-    if $::role::cache::configuration::has_ganglia {
+    if $::standard::has_ganglia {
         class { 'varnish::monitoring::ganglia':
             varnish_instances => [ '', 'frontend' ],
         }
diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
index 338e4c3..fce987f 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -1,8 +1,6 @@
 class role::cache::configuration {
     include lvs::configuration
 
-    $has_ganglia = $::standard::has_ganglia
-
     $backends = {
         'production' => {
             'appservers'        => {
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 6a5ad15..22cb01b 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -5,7 +5,7 @@
 
     include role::cache::2layer
     include role::cache::ssl::unified
-    if $::role::cache::configuration::has_ganglia {
+    if $::standard::has_ganglia {
         include varnish::monitoring::ganglia::vhtcpd
     }
 
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index ab0ba97..cb103e1 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -7,7 +7,7 @@
     require geoip::dev # for VCL compilation using libGeoIP
     include role::cache::2layer
     include role::cache::ssl::unified
-    if $::role::cache::configuration::has_ganglia {
+    if $::standard::has_ganglia {
         include varnish::monitoring::ganglia::vhtcpd
     }
 
diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index d595809..581e9b8 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -5,7 +5,7 @@
 
     include role::cache::2layer
     include role::cache::ssl::unified
-    if $::role::cache::configuration::has_ganglia {
+    if $::standard::has_ganglia {
         include varnish::monitoring::ganglia::vhtcpd
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic063d5dbc95be8df92fc7bdd38774b16b055040d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits