aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-03-23 08:15:00 -0400
committerRyan Hallisey <rhallise@redhat.com>2015-03-23 16:22:05 -0400
commit1aa0f7ce49b16c0f6f76336f623c1f042221363d (patch)
tree4e911db6d1bcb471fba00cdd7067b49e874231c2 /docker
parent07f5999276c80f2b30d47a0139607e4b2bab0483 (diff)
downloadkolla-1aa0f7ce49b16c0f6f76336f623c1f042221363d.tar.gz
kolla-1aa0f7ce49b16c0f6f76336f623c1f042221363d.zip
Fixes bug where heat container was not getting heat meta data
Heat container is having trouble accessing heat meta data. Heat needs to have HEAT_CFN_API_SERVICE_HOST set in order to properly receive meta data. Closes-bug 1435288 Change-Id: Ia28ece3ae91ec7acc62cc86039612841ac487f36
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/heat/heat-base/config-heat.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh
index 3dcb1435a..b85da7e77 100755
--- a/docker/heat/heat-base/config-heat.sh
+++ b/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