BBlack has submitted this change and it was merged.
Change subject: LVS: add salt grain for lvs:(primary|secondary)
......................................................................
LVS: add salt grain for lvs:(primary|secondary)
Also, fix lint warning elsewhere in same file...
Change-Id: Ib26f97dee4c90eceb75f292f6e5778009beacfbc
---
M modules/lvs/manifests/configuration.pp
M modules/role/manifests/lvs/balancer.pp
2 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index afb2f23..facbcbe 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -51,12 +51,16 @@
$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
- # lint:ignore:variable_scope
- 'bgp-peer-address' => $hostname ? {
- # lint:endignore
+ 'bgp-peer-address' => $::hostname ? {
/^lvs100[1-3]$/ => '208.80.154.196', # cr1-eqiad
/^lvs100[4-6]$/ => '208.80.154.197', # cr2-eqiad
/^lvs100[789]$/ => '208.80.154.196', # cr1-eqiad
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: merged
Gerrit-Change-Id: Ib26f97dee4c90eceb75f292f6e5778009beacfbc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
