From 6e6b16691350cd456ba552c342ee954f47ec9714 Mon Sep 17 00:00:00 2001
From: Crag Wolfe <cwolfe@redhat.com>
Date: Fri, 3 May 2013 16:30:24 -0700
Subject: [PATCH 1/2] remove turing off of iptables.  new plan is just to
 document not to use with a oppressive firewall.

---
 foreman_server.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/foreman_server.sh b/foreman_server.sh
index 4ac26173..7dbe7f35 100755
--- a/foreman_server.sh
+++ b/foreman_server.sh
@@ -70,9 +70,6 @@ augtool -s set /files/etc/puppet/puppet.conf/agent/server $PUPPETMASTER
 # Puppet Plugins
 augtool -s set /files/etc/puppet/puppet.conf/main/pluginsync true
 
-# TODO: correctly configure iptables
-service iptables stop
-
 workdir=/root
 pushd $workdir
 

From 1a64c1f98636b5c1e0df55f50252e68ef9f3718b Mon Sep 17 00:00:00 2001
From: Crag Wolfe <cwolfe@redhat.com>
Date: Fri, 3 May 2013 16:33:38 -0700
Subject: [PATCH 2/2] tweaks to generation of foreman_client.sh.

* install rubygems from foreman repo for now to meet that dependency
  requirement.
* call "puppet agent" twice so that when we start the service, it
  should be fully initialized (cert pulled down and known to the
  puppet server).
---
 foreman_server.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/foreman_server.sh b/foreman_server.sh
index 7dbe7f35..71360660 100755
--- a/foreman_server.sh
+++ b/foreman_server.sh
@@ -110,6 +110,7 @@ yum-config-manager --enable rhel-6-server-optional-rpms
 yum clean all
 
 # install dependent packages
+yum install -y http://yum.theforeman.org/releases/latest/el6/x86_64/rubygems-1.8.10-1.el6.noarch.rpm
 yum install -y augeas puppet git policycoreutils-python
 
 # Set PuppetServer
@@ -127,6 +128,8 @@ fi
 
 # check in to foreman
 puppet agent --test
+sleep 1
+puppet agent --test
 
 /etc/init.d/puppet start
 EOF