Gage has submitted this change and it was merged.
Change subject: ipsec: drop the custom $site detection
......................................................................
ipsec: drop the custom $site detection
We already have $::site set globally (and implemented in a better way),
set by realm.pp. Drop the explicit $site detection from this role and
rely on $::site.
Change-Id: Iaa9291ae3eb2e802e6c11dbb4776d4df87913141
---
M manifests/role/ipsec.pp
1 file changed, 2 insertions(+), 11 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ipsec.pp b/manifests/role/ipsec.pp
index cde40c9..73eb4af 100644
--- a/manifests/role/ipsec.pp
+++ b/manifests/role/ipsec.pp
@@ -12,24 +12,15 @@
if $hosts != undef {
$targets = $hosts
} else {
- # determine site from domain name
- case $::domain {
- 'eqiad.wmnet': { $site = 'eqiad' }
- 'codfw.wmnet': { $site = 'codfw' }
- 'esams.wmnet': { $site = 'esams' }
- 'esams.wikimedia.org': { $site = 'esams' }
- 'ulsfo.wmnet': { $site = 'ulsfo' }
- }
-
# for 'left' nodes in cache sites, enumerate 'right' nodes in "main"
sites
- if $site == 'esams' or $site == 'ulsfo' {
+ if $::site == 'esams' or $::site == 'ulsfo' {
$targets = concat(
hiera('hosts_eqiad', []),
hiera('hosts_codfw', [])
)
}
# for 'left' nodes in "main" sites, enumerate 'right' nodes in cache
sites
- if $site == 'eqiad' or $site == 'codfw' {
+ if $::site == 'eqiad' or $::site == 'codfw' {
$targets = concat(
hiera('hosts_esams', []),
hiera('hosts_ulsfo', [])
--
To view, visit https://gerrit.wikimedia.org/r/199292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa9291ae3eb2e802e6c11dbb4776d4df87913141
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Gage <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
