Merge "Fixes bug where heat container was not getting heat meta data"

docker/heat/heat-base/config-heat.sh

@@ -61,8 +61,8 @@ crudini --set /etc/heat/heat.conf ec2authtoken auth_uri \
     "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
 
 # cfn
-#crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \
-#    http://${HEAT_CFN_API_SERVICE_HOST}:8000
-#crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \
-#    http://${HEAT_CFN_API_SERVICE_HOST}:8000/v1/waitcondition
+crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \
+    http://${HEAT_CFN_API_SERVICE_HOST}:8000
+crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \
+    http://${HEAT_CFN_API_SERVICE_HOST}:8000/v1/waitcondition
 

docs/integration-guide.md

@@ -67,13 +67,14 @@ all containers.  This allows a simple method of ensuring every type of node
     NOVA_DB_USER=<nova> - The name of the nova DB password
     NOVA_EC2_API_SERVICE_HOST=<IP> - The IP Address where the Nova EC2 API is hosted
     arn't these two the same?
-    NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address wher ethe Nova EC2 service is hosted
+    NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address where the Nova EC2 service is hosted
     NOVA_KEYSTONE_PASSWORD=<password> - The Nova keystone password
     NOVA_KEYSTONE_USER=<nova> - The Nova keystone username
     HEAT_DB_NAME=<heat> - The heat DB name
     HEAT_DB_PASSWORD=<kolla> - The heat db password
     HEAT_KEYSTONE_PASSWORD=<heat> - The keystone password for the heat user
     HEAT_API_SERVICE_HOST=<IP> - The IP Address where the Heat API service is hosted
+    HEAT_API_CFN_SERVICE_HOST=<IP> - The IP Address where Heat will contact the heat-engine in search for meta data
     PUBLIC_INTERFACE=<eth1> - The nova public interface
     PUBLIC_IP=<Host IP Address> - The IP Address of this host
     RABBITMQ_PASS=<rabbit> - The rabbitmq password used to join AMQP
@@ -83,6 +84,8 @@ all containers.  This allows a simple method of ensuring every type of node
     RABBIT_USERID=<rabbit> - The RabbitMQ user id on the host
 
 
+
+
 ## Launching a container set
 
 Pick out a simple container set and launch it as follows:

tools/genenv

@@ -70,6 +70,7 @@ HEAT_DB_NAME=heat
 HEAT_DB_PASSWORD=kolla
 HEAT_KEYSTONE_PASSWORD=heat
 HEAT_API_SERVICE_HOST=$HOST_IP
+HEAT_CFN_API_SERVICE_HOST=$HOST_IP
 
 cat > ./openrc <<EOF
 export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
@@ -121,4 +122,5 @@ RABBITMQ_SERVICE_HOST=$RABBITMQ_SERVICE_HOST
 RABBITMQ_USER=$RABBIT_USER
 RABBIT_PASSWORD=$RABBIT_PASSWORD
 RABBIT_USERID=$RABBIT_USER
+HEAT_CFN_API_SERVICE_HOST=$HEAT_CFN_API_SERVICE_HOST
 EOF