[MediaWiki-commits] [Gerrit] Mummy says dashes in puppet names are bad! - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has uploaded a new change for review.

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


Change subject: Mummy says dashes in puppet names are bad!
......................................................................

Mummy says dashes in puppet names are bad!

Also, tiers vs layers were inconsistent

Change-Id: Ia63aaf3e626ecc98401b098b4115e4190e72467b
---
M manifests/role/cache.pp
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/68383/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e307175..e4dae83 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -430,8 +430,8 @@
        }
 
 
-       # Ancestor class for common resources of two-tier clusters
-       class varnish::two-tier {
+       # Ancestor class for common resources of 2-layer clusters
+       class varnish::2layer {
                include lvs::configuration, role::cache::configuration, 
network::constants
 
                # Any changes here will affect all descendent Varnish clusters
@@ -467,7 +467,7 @@
                class { "varnish::monitoring::ganglia": varnish_instances => [ 
"", "frontend" ] }
        }
 
-       class varnish::text inherits role::cache::varnish::two-tier {
+       class varnish::text inherits role::cache::varnish::2layer {
                $cluster = "cache_text"
                $nagios_group = "cache_text_${::site}"
 
@@ -584,7 +584,7 @@
                }
        }
 
-       class varnish::upload inherits role::cache::varnish::two-tier {
+       class varnish::upload inherits role::cache::varnish::2layer {
                $cluster = "cache_upload"
                $nagios_group = "cache_upload_${::site}"
 
@@ -823,7 +823,7 @@
                include role::cache::varnish::logging::eventlistener
        }
 
-       class mobile inherits role::cache::varnish::two-tier {
+       class mobile inherits role::cache::varnish::2layer {
                $cluster = "cache_mobile"
                $nagios_group = "cache_mobile_${::site}"
 
@@ -913,7 +913,7 @@
                include role::cache::varnish::logging
        }
 
-       class parsoid inherits role::cache::varnish::two-tier {
+       class parsoid inherits role::cache::varnish::2layer {
                $cluster = "cache_parsoid"
                $nagios_group = "cache_parsoid_${::site}"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia63aaf3e626ecc98401b098b4115e4190e72467b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>

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