Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/217544
Change subject: role::cache: Move inclusion of lvs::configuration from base
......................................................................
role::cache: Move inclusion of lvs::configuration from base
Move the inclusion of lvs::configuration from base to the actual using
classes. That keep the inclusion close the the actual place of use
making it clearer for the reader
Change-Id: Id85f910a20a7f4d56a798f7afdf2d097d976af3c
---
M modules/role/manifests/cache/base.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/parsoid.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
6 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/217544/1
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index bb05c26..390d21a 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -6,7 +6,6 @@
) {
include standard
include nrpe
- include lvs::configuration
include role::cache::configuration
include role::cache::statsd
include network::constants
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index cb1c846..4e8f69e 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -5,6 +5,7 @@
include role::cache::1layer
+ include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['misc_web'][$::site],
}
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index 9e64db9..90f597f 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -9,6 +9,7 @@
include role::cache::2layer
+ include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['mobile'][$::site],
}
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index 43f6dde..a4c857a 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -5,6 +5,7 @@
include role::cache::2layer
+ include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['parsoidcache'][$::site],
}
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index bdac7de..0215424 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -7,6 +7,7 @@
include role::cache::2layer
+ include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 39ce4d7..13b4fec 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -10,6 +10,7 @@
include role::cache::2layer
+ include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
$lvs::configuration::lvs_service_ips[$::realm]['upload'][$::site],
}
--
To view, visit https://gerrit.wikimedia.org/r/217544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id85f910a20a7f4d56a798f7afdf2d097d976af3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
