diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 18:54:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 18:54:43 +0000 |
| commit | 731d5205cbed74028bda0883a5432afc476605b6 (patch) | |
| tree | 38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/heat | |
| parent | 15eb390ab307885943280a4b5d1287dc580517aa (diff) | |
| parent | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff) | |
| download | kolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz kolla-731d5205cbed74028bda0883a5432afc476605b6.zip | |
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/heat')
| -rwxr-xr-x | docker/common/heat/heat-api-cfn/config-internal.sh | 14 | ||||
| -rwxr-xr-x | docker/common/heat/heat-api/config-internal.sh | 12 | ||||
| -rwxr-xr-x | docker/common/heat/heat-base/config-heat.sh | 24 | ||||
| -rwxr-xr-x | docker/common/heat/heat-engine/config-internal.sh | 7 |
4 files changed, 31 insertions, 26 deletions
diff --git a/docker/common/heat/heat-api-cfn/config-internal.sh b/docker/common/heat/heat-api-cfn/config-internal.sh index bcd72250b..4fce4079c 100755 --- a/docker/common/heat/heat-api-cfn/config-internal.sh +++ b/docker/common/heat/heat-api-cfn/config-internal.sh @@ -4,11 +4,15 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-heat.sh -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - HEAT_CFN_KEYSTONE_USER HEAT_CFN_KEYSTONE_PASSWORD \ - KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_PORT \ - ADMIN_TENANT_NAME HEAT_API_CFN_SERVICE_HOST \ - HEAT_API_CFN_SERVICE_PORT +check_required_vars ADMIN_TENANT_NAME \ + HEAT_API_CFN_SERVICE_HOST \ + HEAT_API_CFN_SERVICE_PORT \ + HEAT_CFN_KEYSTONE_PASSWORD \ + HEAT_CFN_KEYSTONE_USER \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT \ + KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_AUTH_PROTOCOL fail_unless_os_service_running keystone diff --git a/docker/common/heat/heat-api/config-internal.sh b/docker/common/heat/heat-api/config-internal.sh index b57aaa710..39acca515 100755 --- a/docker/common/heat/heat-api/config-internal.sh +++ b/docker/common/heat/heat-api/config-internal.sh @@ -4,10 +4,14 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-heat.sh -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - HEAT_KEYSTONE_USER HEAT_KEYSTONE_PASSWORD \ - KEYSTONE_AUTH_PROTOCOL ADMIN_TENANT_NAME \ - HEAT_API_SERVICE_HOST PUBLIC_IP +check_required_vars ADMIN_TENANT_NAME \ + HEAT_API_SERVICE_HOST \ + HEAT_KEYSTONE_PASSWORD \ + HEAT_KEYSTONE_USER \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_AUTH_PROTOCOL \ + PUBLIC_IP fail_unless_os_service_running keystone diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh index 843221ccd..9b71654aa 100755 --- a/docker/common/heat/heat-base/config-heat.sh +++ b/docker/common/heat/heat-base/config-heat.sh @@ -4,21 +4,15 @@ set -e . /opt/kolla/kolla-common.sh -: ${ADMIN_TENANT_NAME:=admin} -: ${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} -: ${RABBIT_PASSWORD:=guest} - -check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \ - HEAT_API_CFN_URL_HOST HEAT_API_CFN_SERVICE_PORT \ - KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \ - KEYSTONE_PUBLIC_SERVICE_PORT RABBITMQ_SERVICE_HOST \ - MARIADB_SERVICE_HOST HEAT_DOMAIN_PASS +check_required_vars HEAT_API_CFN_SERVICE_PORT \ + HEAT_API_CFN_URL_HOST \ + HEAT_DB_PASSWORD \ + HEAT_DOMAIN_PASS \ + HEAT_KEYSTONE_PASSWORD \ + KEYSTONE_PUBLIC_SERVICE_HOST \ + KEYSTONE_PUBLIC_SERVICE_PORT \ + MARIADB_SERVICE_HOST \ + RABBITMQ_SERVICE_HOST fail_unless_db dump_vars diff --git a/docker/common/heat/heat-engine/config-internal.sh b/docker/common/heat/heat-engine/config-internal.sh index 0cafbc480..90fdfb8d0 100755 --- a/docker/common/heat/heat-engine/config-internal.sh +++ b/docker/common/heat/heat-engine/config-internal.sh @@ -4,8 +4,11 @@ . /opt/kolla/config-heat.sh . /openrc -check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD \ - INIT_HEAT_DB HEAT_DOMAIN_PASS +check_required_vars HEAT_DB_NAME \ + HEAT_DB_PASSWORD \ + HEAT_DB_USER \ + HEAT_DOMAIN_PASS \ + INIT_HEAT_DB fail_unless_db if [ "${INIT_HEAT_DB}" == "true" ]; then |
