From 5e094fb1a66d5f7000d19e0ba29ccd05aa8d3910 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Wed, 15 Feb 2012 17:47:06 -0800 Subject: [PATCH] Add bzr to iptables Adds bzr to jenkins iptables Adds symlink for rules.v4 to rules Change-Id: I058cccde7e39860655c3762ca06e2bd5d93f3a1c --- manifests/site.pp | 2 +- modules/iptables/manifests/init.pp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 083d867dd3..d99b70144c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -175,7 +175,7 @@ node "gerrit-dev.openstack.org" { } node "jenkins.openstack.org" { - $iptables_public_tcp_ports = [80, 443] + $iptables_public_tcp_ports = [80, 443, 4155] include openstack_server include jenkins_master } diff --git a/modules/iptables/manifests/init.pp b/modules/iptables/manifests/init.pp index f6cae81dba..c774d0edc3 100644 --- a/modules/iptables/manifests/init.pp +++ b/modules/iptables/manifests/init.pp @@ -38,4 +38,16 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) { notify => Service["iptables-persistent"], ; } + + file { + "/etc/iptables/rules.v4": + owner => "root", + group => "root", + mode => 640, + ensure => link, + target => "/etc/iptables/rules", + require => File["/etc/iptables/rules"], + notify => Service["iptables-persistent"] + } + }