Muehlenhoff has submitted this change and it was merged.
Change subject: Query the puppetmaster from hiera instead of $::serverip
......................................................................
Query the puppetmaster from hiera instead of $::serverip
On strontium the $::serverip resolved to strontium's IP address instead of
the IP address of palladium, which made the ferm rule rather ineffective.
Change-Id: I0fe4a0bb283c0d139b23f59ae88bbe4e726253ea
---
M manifests/role/puppetmaster.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 8862957..5686f2e 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -61,10 +61,11 @@
port => 8141,
}
+ $puppetmaster_hostname = hiera('puppetmaster')
ferm::service { 'ssh_puppet_merge':
proto => 'tcp',
port => '22',
- srange => "$::serverip",
+ srange => "@resolve($puppetmaster_hostname)"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fe4a0bb283c0d139b23f59ae88bbe4e726253ea
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
