diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-08 19:22:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-08 19:22:54 +0000 |
| commit | 36258963a7673251b42658de629300dd5e265fe8 (patch) | |
| tree | 1a6915be1b0ef5d5233c7fb611738ce5f99a0e5b | |
| parent | 6fabb5c9aab82bb85e12ddf5c10b3a32175d8fbb (diff) | |
| parent | a8f3c5ff86ad83a71bafd42ba326b509294114f1 (diff) | |
| download | kolla-36258963a7673251b42658de629300dd5e265fe8.tar.gz kolla-36258963a7673251b42658de629300dd5e265fe8.zip | |
Merge "Remove duplicate write of openrc"
| -rw-r--r-- | docker/glance/glance-base/config-glance.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index 990788813..a6380e5c8 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -15,7 +15,7 @@ check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD dump_vars cat > /openrc <<EOF -export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR}:5000/v2.0" +export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" export OS_USERNAME="${GLANCE_KEYSTONE_USER}" export OS_PASSWORD="${GLANCE_KEYSTONE_PASSWORD}" export OS_TENANT_NAME="${ADMIN_TENANT_NAME}" @@ -56,10 +56,3 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}" done -cat > /openrc <<EOF -export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" -export OS_USERNAME=glance -export OS_PASSWORD="${GLANCE_KEYSTONE_PASSWORD}" -export OS_TENANT_NAME=${ADMIN_TENANT_NAME} -EOF - |