diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-03 13:22:20 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 05:33:55 -0700 |
| commit | ea0f5c7efaaefbc7c7ccc0db29560b780358097d (patch) | |
| tree | 8308cd37445041204adf09fdc45d51821740a08e /docker/heat/heat-base | |
| parent | 61cc479e90d321f7eac71749ebe3fe96081c1e05 (diff) | |
| download | kolla-ea0f5c7efaaefbc7c7ccc0db29560b780358097d.tar.gz kolla-ea0f5c7efaaefbc7c7ccc0db29560b780358097d.zip | |
Add heat-api-cfn
Add Heat-api-cfn for wait conditions
Magnum needs wait conditions in order to operate properly. heat-api-cfn
is where wait conditions connect.
Change-Id: I56742dd96e4607dc0042d0cef4e18c922f9ed736
Implements: blueprint container-heat-api-cfn
Diffstat (limited to 'docker/heat/heat-base')
| -rwxr-xr-x | docker/heat/heat-base/config-heat.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh index ef2d0f949..74b2718a4 100755 --- a/docker/heat/heat-base/config-heat.sh +++ b/docker/heat/heat-base/config-heat.sh @@ -8,6 +8,7 @@ set -e : ${HEAT_DB_NAME:=heat} : ${HEAT_DB_USER:=heat} : ${HEAT_KEYSTONE_USER:=heat} +: ${HEAT_CFN_KEYSTONE_USER:=heat_cfn} : ${KEYSTONE_AUTH_PROTOCOL:=http} : ${PUBLIC_IP:=$HEAT_API_PORT_8004_TCP_ADDR} : ${RABBIT_USER:=guest} @@ -33,11 +34,11 @@ crudini --set /etc/heat/heat.conf DEFAULT use_stderr \ crudini --set /etc/heat/heat.conf DEFAULT rpc_backend \ heat.openstack.common.rpc.impl_kombu crudini --set /etc/heat/heat.conf DEFAULT rabbit_host \ - ${RABBITMQ_SERVICE_HOST} + "${RABBITMQ_SERVICE_HOST}" crudini --set /etc/heat/heat.conf DEFAULT rabbit_userid \ - ${RABBIT_USER} + "${RABBIT_USER}" crudini --set /etc/heat/heat.conf DEFAULT rabbit_password \ - ${RABBIT_PASSWORD} + "${RABBIT_PASSWORD}" crudini --set /etc/heat/heat.conf database connection \ mysql://${HEAT_DB_USER}:${HEAT_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${HEAT_DB_NAME} @@ -47,9 +48,9 @@ crudini --set /etc/heat/heat.conf keystone_authtoken auth_protocol \ crudini --set /etc/heat/heat.conf keystone_authtoken auth_host \ "${KEYSTONE_PUBLIC_SERVICE_HOST}" crudini --set /etc/heat/heat.conf keystone_authtoken auth_port \ - 5000 + "${KEYSTONE_PUBLIC_SERVICE_PORT}" crudini --set /etc/heat/heat.conf keystone_authtoken auth_uri \ - "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" + "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0" crudini --set /etc/heat/heat.conf keystone_authtoken admin_tenant_name \ "${ADMIN_TENANT_NAME}" crudini --set /etc/heat/heat.conf keystone_authtoken admin_user \ @@ -58,11 +59,9 @@ crudini --set /etc/heat/heat.conf keystone_authtoken admin_password \ "${HEAT_KEYSTONE_PASSWORD}" crudini --set /etc/heat/heat.conf ec2authtoken auth_uri \ - "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" + "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0" -# cfn crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \ - http://${HEAT_CFN_API_SERVICE_HOST}:8000 + http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT} crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \ - http://${HEAT_CFN_API_SERVICE_HOST}:8000/v1/waitcondition - + http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1/waitcondition |