Fixing some paths for SCL

dzungdo · May 28, 2013 · 331d123 · 331d123
1 parent d9212eb
commit 331d123
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/bin/foreman-params.json b/bin/foreman-params.json
@@ -10,23 +10,23 @@
  },
  "globals": {
  "admin_email": "EDIT ME: EG [email protected]",
- "admin_password": "changeme",
+ "admin_password": "CHANGEME",
  "controller_node_public": "EDIT ME: EG 10.100.0.2",
  "fixed_network_range": "EDIT ME: EG 10.100.10.0/24",
  "floating_network_range": "EDIT ME: EG 8.21.28.128/25",
  "pacemaker_pub_floating_ip": "EDIT ME: EG 10.100.10.0/24",
  "pacemaker_priv_floating_ip": "EDIT ME: EG 8.21.28.128/25",
- "glance_db_password": "changeme",
- "glance_user_password": "changeme",
+ "glance_db_password": "CHANGEME",
+ "glance_user_password": "CHANGEME",
  "horizon_secret_key": "secret",
  "keystone_admin_token": "secret",
- "keystone_db_password": "changeme",
- "keystone_password": "changeme",
- "mysql_root_password": "changeme",
- "nova_db_password": "changeme",
- "nova_user_password": "changeme",
- "cinder_db_password": "changeme",
- "cinder_user_password": "changeme",
+ "keystone_db_password": "CHANGEME",
+ "keystone_password": "CHANGEME",
+ "mysql_root_password": "CHANGEME",
+ "nova_db_password": "CHANGEME",
+ "nova_user_password": "CHANGEME",
+ "cinder_db_password": "CHANGEME",
+ "cinder_user_password": "CHANGEME",
  "private_interface": "EDIT ME: em1",
  "public_interface": "EDIT ME: em2",
  "verbose": "true"

diff --git a/bin/foreman_server.sh b/bin/foreman_server.sh
@@ -89,13 +89,16 @@ rm /etc/httpd/conf.d/passenger.conf
 cp ../config/dbmigrate $FOREMAN_DIR/extras/
 
 # turn on certificate autosigning
-echo '*' >> /etc/puppet/autosign.conf
+echo '*' >> $SCL_RUBY_HOME/etc/puppet/autosign.conf
 
 # install puppet modules
-mkdir -p /etc/puppet/modules/production
-cp -r ../puppet/* /etc/puppet/modules/production/
+mkdir -p $SCL_RUBY_HOME/etc/puppet/environments/production/modules
+cp -r ../puppet/* $SCL_RUBY_HOME/etc/puppet/environments/production/modules/
 sudo -u foreman scl enable ruby193 "cd $FOREMAN_DIR; RAILS_ENV=production rake puppet:import:puppet_classes[batch]"
 
+# reset permissions
+sudo -u foreman scl enable ruby193 "cd $FOREMAN_DIR; RAILS_ENV=production rake permissions:reset"
+
 # Configure defaults, host groups, proxy, etc
 
 sed -i "s/foreman_hostname/$PUPPETMASTER/" foreman-params.json
@@ -105,7 +108,7 @@ export PASSWD_COUNT=$(cat foreman-params.json | grep changeme | wc -l)
 for i in $(seq $PASSWD_COUNT)
 do
  export PASSWD=$(scl enable ruby193 "ruby foreman-setup.rb password")
- sed -i "s/changeme/$PASSWD" foreman-params.json
+ sed -i "s/CHANGEME/$PASSWD" foreman-params.json
 done
 
 scl enable ruby193 "ruby foreman-setup.rb proxy"