diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-23 20:48:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-23 20:48:41 +0000 |
| commit | d9442590569fed8ae161025fdc873fbbc1b4c8f7 (patch) | |
| tree | 0e1a4edc25a51cb44ebcd4f0d27ebb63087167dd /docker | |
| parent | 3d37fd95d7866a4cc0d098ee980738c937c959f7 (diff) | |
| parent | 1aa0f7ce49b16c0f6f76336f623c1f042221363d (diff) | |
| download | kolla-d9442590569fed8ae161025fdc873fbbc1b4c8f7.tar.gz kolla-d9442590569fed8ae161025fdc873fbbc1b4c8f7.zip | |
Merge "Fixes bug where heat container was not getting heat meta data"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/heat/heat-base/config-heat.sh | 8 |
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 |