From 7340433e51360dc21bd1b0d8cd9dc0f587a1ed09 Mon Sep 17 00:00:00 2001
From: James Martin <jmartin@basho.com>
Date: Thu, 6 Dec 2012 22:46:13 -0500
Subject: [PATCH] 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 <bhaisaab@apache.org>
---
 .../devcloudinitial}/files/iptables.save      |  0
 .../modules/devcloudinitial/manifests/init.pp |  9 ++++++++
 .../puppet/modules/devcloud/manifests/init.pp | 21 +++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename tools/devcloud/{puppet/modules/devcloud => deps/boxes/xenbox-build/puppet/modules/devcloudinitial}/files/iptables.save (100%)

diff --git a/tools/devcloud/puppet/modules/devcloud/files/iptables.save b/tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save
similarity index 100%
rename from tools/devcloud/puppet/modules/devcloud/files/iptables.save
rename to tools/devcloud/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save
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 c076a712d98..a3e3a5a623d 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',
diff --git a/tools/devcloud/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/puppet/modules/devcloud/manifests/init.pp
index 752eae81e92..12e68f41cc8 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';
 
     }