Iptables file must be puppeted in the xenbox stage so it exists when the network is started in the devcloud phase.
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7340433e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7340433e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7340433e Branch: refs/heads/master Commit: 7340433e51360dc21bd1b0d8cd9dc0f587a1ed09 Parents: 0555b79 Author: James Martin <[email protected]> Authored: Thu Dec 6 22:46:13 2012 -0500 Committer: Rohit Yadav <[email protected]> Committed: Fri Dec 14 19:36:38 2012 -0800 ---------------------------------------------------------------------- .../modules/devcloudinitial/files/iptables.save | 30 +++++++++++++++ .../modules/devcloudinitial/manifests/init.pp | 9 ++++ .../puppet/modules/devcloud/files/iptables.save | 30 --------------- .../puppet/modules/devcloud/manifests/init.pp | 21 +++------- 4 files changed, 46 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7340433e/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save ---------------------------------------------------------------------- diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save new file mode 100644 index 0000000..07647f8 --- /dev/null +++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +*mangle +:PREROUTING ACCEPT [397:23804] +:INPUT ACCEPT [397:23804] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [238:22820] +:POSTROUTING ACCEPT [238:22820] +-A POSTROUTING -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill +COMMIT +*filter +:INPUT ACCEPT [453:27164] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [273:26476] +COMMIT http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7340433e/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp index c076a71..a3e3a5a 100644 --- a/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp +++ b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp @@ -32,9 +32,18 @@ else { "xcp-xapi": require => Package["xen-hypervisor-4.1-${debarch}"], ensure => latest; + "iptables": + ensure => latest; } file { + '/etc/iptables.save': + require => Package['iptables'], + ensure => 'file', + source => 'puppet:///modules/devcloudinitial/iptables.save', + group => '0', + mode => '644', + owner => '0'; '/etc/xcp/network.conf': require => Package['xcp-xapi'], ensure => 'file', http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7340433e/tools/devcloud/puppet/modules/devcloud/files/iptables.save ---------------------------------------------------------------------- diff --git a/tools/devcloud/puppet/modules/devcloud/files/iptables.save b/tools/devcloud/puppet/modules/devcloud/files/iptables.save deleted file mode 100644 index 07647f8..0000000 --- a/tools/devcloud/puppet/modules/devcloud/files/iptables.save +++ /dev/null @@ -1,30 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -*mangle -:PREROUTING ACCEPT [397:23804] -:INPUT ACCEPT [397:23804] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [238:22820] -:POSTROUTING ACCEPT [238:22820] --A POSTROUTING -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill -COMMIT -*filter -:INPUT ACCEPT [453:27164] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [273:26476] -COMMIT http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7340433e/tools/devcloud/puppet/modules/devcloud/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp index 752eae8..12e68f4 100644 --- a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp +++ b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp @@ -223,20 +223,13 @@ class devcloud ( mode => '755', owner => 'root', group => 'root'; - '/etc/iptables.save': - require => Package['iptables'], - ensure => 'file', - source => 'puppet:///modules/devcloud/iptables.save', - group => '0', - mode => '644', - owner => '0'; - "/etc/exports": - require => Package['nfs-server'], - ensure => 'file', - source => 'puppet:///modules/devcloud/exports', - mode => '644', - owner => '0', - group => '0'; + "/etc/exports": + require => Package['nfs-server'], + ensure => 'file', + source => 'puppet:///modules/devcloud/exports', + mode => '644', + owner => '0', + group => '0'; }
