Merge pull request redhat-openstack#19 from jistr/scl_tweaks

SCL tweaks

bin/foreman_server.sh

@@ -48,14 +48,15 @@ sudo sed -i 's/net.ipv4.ip_forward = 0/net.ipv4.ip_forward = 1/g' /etc/sysctl.co
 # TODO: selinux policy
 setenforce 0
 
-augtool -s set /files/etc/puppet/puppet.conf/agent/server $PUPPETMASTER
+augtool -s set /files/opt/rh/ruby193/root/etc/puppet/puppet.conf/agent/server $PUPPETMASTER
 
 # Puppet Plugins
-augtool -s set /files/etc/puppet/puppet.conf/main/pluginsync true
+augtool -s set /files/opt/rh/ruby193/root/etc/puppet/puppet.conf/main/pluginsync true
 
 pushd $FOREMAN_INSTALLER_DIR
 cat > installer.pp << EOM
 include puppet
+include puppet::server
 include passenger
 class { 'foreman':
  db_type => 'mysql',
@@ -118,17 +119,17 @@ cat >/tmp/foreman_client.sh <<EOF
 yum install -y augeas ruby193-puppet
 
 # Set PuppetServer
-augtool -s set /files/etc/puppet/puppet.conf/agent/server $PUPPETMASTER
+augtool -s set /files/opt/rh/ruby193/root/etc/puppet/puppet.conf/agent/server $PUPPETMASTER
 
 # Puppet Plugins
-augtool -s set /files/etc/puppet/puppet.conf/main/pluginsync true
+augtool -s set /files/opt/rh/ruby193/root/etc/puppet/puppet.conf/main/pluginsync true
 
 # check in to foreman
-puppet agent --test
+scl enable ruby193 "puppet agent --test"
 sleep 1
-puppet agent --test
+scl enable ruby193 "puppet agent --test"
 
-/etc/init.d/puppet start
+/etc/init.d/ruby193-puppet start
 EOF
 
 echo "Foreman is installed and almost ready for setting up your OpenStack"