BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281972
Change subject: LVS: add salt grain for lvs:(primary|secondary)
......................................................................
LVS: add salt grain for lvs:(primary|secondary)
Change-Id: Ib26f97dee4c90eceb75f292f6e5778009beacfbc
---
M modules/lvs/manifests/configuration.pp
M modules/role/manifests/lvs/balancer.pp
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/281972/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index afb2f23..d665f36 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -51,6 +51,13 @@
$v6_ip = '::'
}
+ $lvs_grain = $hostname ? {
+ /^lvs100[123789]$/ => 'primary',
+ /^lvs200[123]$/ => 'primary',
+ /^lvs[34]00[12]$/ => 'primary',
+ default => 'secondary'
+ }
+
$pybal = {
'bgp' => hiera('lvs::configuration::bgp', 'yes'),
# FIXME - top-scope var without namespace, will break in puppet 2.8
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index cc08868..5263e74 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -87,6 +87,12 @@
include standard
+ salt::grain { 'lvs':
+ grain => 'lvs',
+ value => $lvs::configuration::lvs_grain,
+ replace => true,
+ }
+
# temporary experimental component used here as it includes a newer Linux
kernel
if $::operatingsystem == 'Debian' {
apt::repository { 'wikimedia-experimental':
--
To view, visit https://gerrit.wikimedia.org/r/281972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib26f97dee4c90eceb75f292f6e5778009beacfbc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
