Merge pull request redhat-openstack#10 from cwolferh/work2

Work2
dzungdo · May 4, 2013 · 23d66b3 · 23d66b3
2 parents 5a10d4c + 1a64c1f
commit 23d66b3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
 
@@ -113,6 +110,7 @@ yum-config-manager --enable rhel-6-server-optional-rpms
 yum clean all
 
 # install dependent packages
+yum install -y http:https://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
@@ -130,6 +128,8 @@ fi
 
 # check in to foreman
 puppet agent --test
+sleep 1
+puppet agent --test
 
 /etc/init.d/puppet start
 EOF