diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-02 16:17:54 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2014-12-17 13:22:20 +0900 |
| commit | bfa5d0a2ec8599be983d11acc09e326f5b84263d (patch) | |
| tree | 48c52cf9ba9091073d2c5c334bd1915f1fda972d /docker/ceilometer | |
| parent | 9aadaef82e9d2de260a7a3e3651b77a790515fcc (diff) | |
| download | kolla-bfa5d0a2ec8599be983d11acc09e326f5b84263d.tar.gz kolla-bfa5d0a2ec8599be983d11acc09e326f5b84263d.zip | |
Fix use of undefined KEYSTONE_SERVICE_HOST in Ceilometer
This variable is never defined anywhere, and it is not one of the
variable automatically exported by k8s or docker.
It should be KEYSTONE_PUBLIC_SERVICE_HOST instead.
Change-Id: Ib65b0189d0a767212fbb7eff4ce81717d492c3e2
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/config-ceilometer.sh | 6 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/start.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh index 64008ab8b..87dcac653 100644 --- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh +++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh @@ -25,14 +25,14 @@ cfg=/etc/ceilometer/ceilometer.conf crudini --set $cfg \ DEFAULT rpc_backend rabbit crudini --set $cfg \ - DEFAULT rabbit_host ${KEYSTONE_SERVICE_HOST} + DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST} crudini --set $cfg \ DEFAULT rabbit_password ${RABBITMQ_PASS} crudini --set $cfg \ keystone_authtoken \ auth_uri \ - "http://${KEYSTONE_SERVICE_HOST}:5000/" + "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/" crudini --set $cfg \ keystone_authtoken \ admin_tenant_name \ @@ -49,7 +49,7 @@ crudini --set $cfg \ crudini --set $cfg \ service_credentials \ os_auth_url \ - ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:5000/ + ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/ crudini --set $cfg \ service_credentials \ os_username \ diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh index 3e3c6c82a..d9b62be82 100644 --- a/docker/ceilometer/ceilometer-compute/start.sh +++ b/docker/ceilometer/ceilometer-compute/start.sh @@ -4,7 +4,7 @@ . /opt/kolla/config-ceilometer.sh -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME +check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME check_for_keystone @@ -18,7 +18,7 @@ crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute #ceilometer settings cfg=/etc/ceilometer/ceilometer.conf crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN} -crudini --set $cfg rabbit_host ${KEYSTONE_SERVICE_HOST} +crudini --set $cfg rabbit_host ${RABBITMQ_SERVICE_HOST} crudini --set $cfg rabbit_password ${RABBITMQ_PASS} |