BBlack has uploaded a new change for review.

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

Change subject: cache.pp cleanup: class names: s/r::c::ssl::/r::c::ssl_/
......................................................................

cache.pp cleanup: class names: s/r::c::ssl::/r::c::ssl_/

reduces classname depth

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/203559/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7de5591..4cb8d7d 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -504,7 +504,7 @@
     }
 }
 
-class role::cache::ssl::sni {
+class role::cache::ssl_sni {
     #TODO: kill the old wmf_ca
     include certificates::wmf_ca
     include certificates::wmf_ca_2014_2017
@@ -565,7 +565,7 @@
 }
 
 # As above, but for misc instead of generic prod
-class role::cache::ssl::misc {
+class role::cache::ssl_misc {
     #TODO: kill the old wmf_ca
     include certificates::wmf_ca
     include certificates::wmf_ca_2014_2017
@@ -774,7 +774,7 @@
     }
 
     if $::realm == 'production' {
-        include role::cache::ssl::sni
+        include role::cache::ssl_sni
     }
 
     require geoip
@@ -933,7 +933,7 @@
     }
 
     if $::realm == 'production' {
-        include role::cache::ssl::sni
+        include role::cache::ssl_sni
     }
 
     class { 'lvs::realserver':
@@ -1105,7 +1105,7 @@
 class role::cache::bits inherits role::cache::1layer {
 
     if $::realm == 'production' {
-        include role::cache::ssl::sni
+        include role::cache::ssl_sni
     }
 
     class { 'lvs::realserver':
@@ -1220,7 +1220,7 @@
     }
 
     if $::realm == 'production' {
-        include role::cache::ssl::sni
+        include role::cache::ssl_sni
     }
 
     class { 'lvs::realserver':
@@ -1397,7 +1397,7 @@
     }
 }
 
-class role::cache::ssl::parsoid {
+class role::cache::ssl_parsoid {
     # Explicitly not adding wmf CA since it is not needed for now
     include role::protoproxy::ssl::common
 
@@ -1420,7 +1420,7 @@
 class role::cache::parsoid inherits role::cache::2layer {
 
     if ( $::realm == 'production' ) {
-        include role::cache::ssl::parsoid
+        include role::cache::ssl_parsoid
         class { 'lvs::realserver':
             realserver_ips => 
$lvs::configuration::lvs_service_ips[$::realm]['parsoidcache'][$::site],
         }
@@ -1553,7 +1553,7 @@
 
     include standard
     include nrpe
-    include role::cache::ssl::misc
+    include role::cache::ssl_misc
 
     $memory_storage_size = 8
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eaf09ce2f544bd37c7f4b7100c6900095983bda
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

Reply via email to