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/ceilometer | |
| 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/ceilometer')
4 files changed, 24 insertions, 19 deletions
diff --git a/docker/common/ceilometer/ceilometer-api/config-internal.sh b/docker/common/ceilometer/ceilometer-api/config-internal.sh index f081c9f84..fb34a468f 100755 --- a/docker/common/ceilometer/ceilometer-api/config-internal.sh +++ b/docker/common/ceilometer/ceilometer-api/config-internal.sh @@ -5,12 +5,19 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-ceilometer.sh -check_required_vars CEILOMETER_DB_USER CEILOMETER_DB_NAME \ - CEILOMETER_DB_PASSWORD KEYSTONE_ADMIN_TOKEN \ - KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT ADMIN_TENANT_NAME \ - CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD \ - CEILOMETER_API_SERVICE_HOST PUBLIC_IP +check_required_vars ADMIN_TENANT_NAME \ + CEILOMETER_ADMIN_PASSWORD \ + CEILOMETER_API_SERVICE_HOST \ + CEILOMETER_DB_NAME \ + CEILOMETER_DB_PASSWORD \ + CEILOMETER_DB_USER \ + CEILOMETER_KEYSTONE_USER \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT \ + KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_AUTH_PROTOCOL \ + PUBLIC_IP + fail_unless_os_service_running keystone fail_unless_db diff --git a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh index 4161e48df..e01ebccc2 100644 --- a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh +++ b/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh @@ -3,17 +3,11 @@ set -e . /opt/kolla/kolla-common.sh -: ${CEILOMETER_DB_USER:=ceilometer} -: ${CEILOMETER_DB_NAME:=ceilometer} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${CEILOMETER_KEYSTONE_USER:=admin} -: ${CEILOMETER_ADMIN_PASSWORD:=kolla} -: ${ADMIN_TENANT_NAME:=admin} -: ${METERING_SECRET:=ceilometer} -: ${RABBIT_PASSWORD:=guest} +check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT \ + KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_PUBLIC_SERVICE_HOST -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST dump_vars cat > /openrc <<EOF diff --git a/docker/common/ceilometer/ceilometer-central/config-internal.sh b/docker/common/ceilometer/ceilometer-central/config-internal.sh index 76f9a1fc2..1cc8d46cf 100755 --- a/docker/common/ceilometer/ceilometer-central/config-internal.sh +++ b/docker/common/ceilometer/ceilometer-central/config-internal.sh @@ -3,8 +3,10 @@ . /opt/kolla/kolla-common.sh . /opt/kolla/config-ceilometer.sh -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT +check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT \ + KEYSTONE_AUTH_PROTOCOL \ + KEYSTONE_ADMIN_TOKEN fail_unless_os_service_running keystone diff --git a/docker/common/ceilometer/ceilometer-compute/config-internal.sh b/docker/common/ceilometer/ceilometer-compute/config-internal.sh index f4fc30bae..633fa6183 100755 --- a/docker/common/ceilometer/ceilometer-compute/config-internal.sh +++ b/docker/common/ceilometer/ceilometer-compute/config-internal.sh @@ -4,7 +4,9 @@ . /opt/kolla/config-ceilometer.sh -check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST RABBIT_PASSWORD +check_required_vars KEYSTONE_ADMIN_TOKEN \ + RABBITMQ_SERVICE_HOST \ + RABBIT_PASSWORD fail_unless_os_service_running keystone |