[MediaWiki-commits] [Gerrit] Make ferm list into an actual list. - change (operations/puppet)

2015-07-01 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged.

Change subject: Make ferm list into an actual list.
..


Make ferm list into an actual list.

Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801
---
M modules/openstack/manifests/controller_firewall.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/manifests/controller_firewall.pp 
b/modules/openstack/manifests/controller_firewall.pp
index 0a9c1ed..8490998 100644
--- a/modules/openstack/manifests/controller_firewall.pp
+++ b/modules/openstack/manifests/controller_firewall.pp
@@ -72,10 +72,10 @@
 
 # services provided to Labs instances
 ferm::rule { 'puppetmaster':
-rule => "saddr ${labs_vms} ${monitoring} proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${monitoring}) proto tcp dport 8140 
ACCEPT;",
 }
 ferm::rule { 'salt':
-rule => "saddr ${labs_vms} ${monitoring} proto tcp dport (4505 4506) 
ACCEPT;",
+rule => "saddr (${labs_vms} ${monitoring}) proto tcp dport (4505 4506) 
ACCEPT;",
 }
 
 # mysql access from iron

-- 
To view, visit https://gerrit.wikimedia.org/r/222141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make ferm list into an actual list. - change (operations/puppet)

2015-07-01 Thread Andrew Bogott (Code Review) 
Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222141

Change subject: Make ferm list into an actual list.
..

Make ferm list into an actual list.

Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801
---
M modules/openstack/manifests/controller_firewall.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/222141/1

diff --git a/modules/openstack/manifests/controller_firewall.pp 
b/modules/openstack/manifests/controller_firewall.pp
index 0a9c1ed..8490998 100644
--- a/modules/openstack/manifests/controller_firewall.pp
+++ b/modules/openstack/manifests/controller_firewall.pp
@@ -72,10 +72,10 @@
 
 # services provided to Labs instances
 ferm::rule { 'puppetmaster':
-rule => "saddr ${labs_vms} ${monitoring} proto tcp dport 8140 ACCEPT;",
+rule => "saddr (${labs_vms} ${monitoring}) proto tcp dport 8140 
ACCEPT;",
 }
 ferm::rule { 'salt':
-rule => "saddr ${labs_vms} ${monitoring} proto tcp dport (4505 4506) 
ACCEPT;",
+rule => "saddr (${labs_vms} ${monitoring}) proto tcp dport (4505 4506) 
ACCEPT;",
 }
 
 # mysql access from iron

-- 
To view, visit https://gerrit.wikimedia.org/r/222141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits