Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ipsec: facts in the right scope
......................................................................
ipsec: facts in the right scope
Change-Id: I4f89861a456b39de569b341950393422cc26b732
---
M manifests/role/ipsec.pp
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ipsec.pp b/manifests/role/ipsec.pp
index a608c58..8fce15a 100644
--- a/manifests/role/ipsec.pp
+++ b/manifests/role/ipsec.pp
@@ -2,10 +2,10 @@
case $::realm {
'labs': {
# labs nodes use their EC2 ID as their puppet cert name
- $puppet_certname = "${ec2id}.${domain}"
+ $puppet_certname = "${::ec2id}.${::domain}"
}
default: {
- $puppet_certname = "${fqdn}"
+ $puppet_certname = $::fqdn
}
}
@@ -13,7 +13,7 @@
$targets = $hosts
} else {
# determine site from domain name
- case $domain {
+ case $::domain {
'eqiad.wmnet': { $site = 'eqiad' }
'codfw.wmnet': { $site = 'codfw' }
'esams.wmnet': { $site = 'esams' }
@@ -22,19 +22,19 @@
}
# determine cache type based on whether it contains the local node
- if $fqdn in hiera("text_${site}", "") { $cachetype = "text" }
- if $fqdn in hiera("bits_${site}", "") { $cachetype = "bits" }
- if $fqdn in hiera("upload_${site}", "") { $cachetype = "upload" }
- if $fqdn in hiera("mobile_${site}", "") { $cachetype = "mobile" }
+ if $::fqdn in hiera("text_${site}", "") { $cachetype = "text" }
+ if $::fqdn in hiera("bits_${site}", "") { $cachetype = "bits" }
+ if $::fqdn in hiera("upload_${site}", "") { $cachetype = "upload" }
+ if $::fqdn in hiera("mobile_${site}", "") { $cachetype = "mobile" }
# enumerate hosts of the same cache type in other sites
- if $site == "esams" or $site == "ulsfo" {
+ if $site == 'esams' or $site == 'ulsfo' {
$targets = concat(
hiera("${cachetype}_eqiad", []),
hiera("${cachetype}_codfw", [])
)
}
- if $site == "eqiad" or $site == "codfw" {
+ if $site == 'eqiad' or $site == 'codfw' {
$targets = concat(
hiera("${cachetype}_esams", []),
hiera("${cachetype}_ulsfo", [])
--
To view, visit https://gerrit.wikimedia.org/r/194489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f89861a456b39de569b341950393422cc26b732
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Gage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
