RDO heat script additional automation

Author: alexpilotti

configure-rdo-heat.sh

@@ -5,11 +5,14 @@ yum install -y "openstack-heat-*" python-heatclient
 
 CONFIG_ROOT_MYSQL_PW=`crudini --get ~/packstack_answers.conf general CONFIG_MYSQL_PW`
 
+QPID_HOST=`crudini --get /etc/nova/nova.conf DEFAULT qpid_hostname`
+QPID_USERNAME=`crudini --get /etc/nova/nova.conf DEFAULT qpid_username`
+QPID_PASSWORD=`crudini --get /etc/nova/nova.conf DEFAULT qpid_password`
+
 HEAT_DB_PW=Passw0rd
 HEAT_USER_PW=Passw0rd
-HEAT_HOSTNAME=192.168.209.130
+HEAT_HOSTNAME=$QPID_HOST
 HEAT_CFN_HOSTNAME=$HEAT_HOSTNAME
-QPID_HOST=$HEAT_HOSTNAME
 
 crudini --set /etc/heat/heat.conf DEFAULT sql_connection mysql://heat:$HEAT_DB_PW@localhost/heat
 heat-db-setup rpm -y -r $CONFIG_ROOT_MYSQL_PW -p $HEAT_DB_PW
@@ -31,15 +34,15 @@ keystone role-create --name heat_stack_user
 
 pushd . && cd /etc/init.d && for s in $(ls openstack-heat-*); do chkconfig $s on && service $s start; done && popd
 
-crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url http://$HEAT_HOSTNAME:8000
-crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url http://$HEAT_HOSTNAME:8000/v1/waitcondition
-crudini --set /etc/heat/heat.conf DEFAULT heat_watch_server_url http://$HEAT_HOSTNAME:8003
+crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url http://$HEAT_CFN_HOSTNAME:8000
+crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url http://$HEAT_CFN_HOSTNAME:8000/v1/waitcondition
+crudini --set /etc/heat/heat.conf DEFAULT heat_watch_server_url http://$HEAT_CFN_HOSTNAME:8003
 #crudini --set /etc/heat/heat.conf DEFAULT debug true
 #crudini --set /etc/heat/heat.conf DEFAULT verbose true
 crudini --set /etc/heat/heat.conf DEFAULT rpc_backend heat.openstack.common.rpc.impl_qpid
 crudini --set /etc/heat/heat.conf DEFAULT qpid_hostname $QPID_HOST
-crudini --set /etc/heat/heat.conf DEFAULT qpid_username guest
-crudini --set /etc/heat/heat.conf DEFAULT qpid_password guest
+crudini --set /etc/heat/heat.conf DEFAULT qpid_username $QPID_USERNAME
+crudini --set /etc/heat/heat.conf DEFAULT qpid_password $QPID_PASSWORD
 
 # Note: had to do this, possibly a bug in the heat RPMs
 chown heat.heat /var/log/heat/*