Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/309614
Change subject: Remove some redundant settings from labs/puppetmaster role
......................................................................
Remove some redundant settings from labs/puppetmaster role
Change-Id: Ic8f7abe3a59c6885d6dd99b57a648f93c5719121
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/309614/1
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index 1600e36..90a3f49 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -86,16 +86,14 @@
include labspuppetbackend
$labs_vms = $novaconfig['fixed_range']
- $labs_metal = join(hiera('labs_baremetal_servers', []), ' ')
- $horizon = ipresolve(hiera('labs_horizon_host'),4)
$monitoring = '208.80.154.14'
$fwrules = {
puppetmaster => {
- rule => "saddr (${labs_vms} ${labs_metal} ${monitoring}
${horizon}) proto tcp dport 8140 ACCEPT;",
+ rule => "saddr (${labs_vms} ${labs_metal} ${monitoring}
${horizon_host_ip}) proto tcp dport 8140 ACCEPT;",
},
puppetbackend => {
- rule => "saddr (${labs_vms} ${labs_metal} ${monitoring}
${horizon}) proto tcp dport 8100 ACCEPT;",
+ rule => "saddr (${labs_vms} ${labs_metal} ${monitoring}
${horizon_host_ip}) proto tcp dport 8100 ACCEPT;",
},
}
create_resources (ferm::rule, $fwrules)
--
To view, visit https://gerrit.wikimedia.org/r/309614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8f7abe3a59c6885d6dd99b57a648f93c5719121
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
