diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-01 16:30:54 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2014-12-04 16:51:32 +0900 |
| commit | a8f3c5ff86ad83a71bafd42ba326b509294114f1 (patch) | |
| tree | 0da55c4030b6209d5778623b7aca38bc7d1da03c | |
| parent | 7f66766c9c433238923a6011405af9b7bc321228 (diff) | |
| download | kolla-a8f3c5ff86ad83a71bafd42ba326b509294114f1.tar.gz kolla-a8f3c5ff86ad83a71bafd42ba326b509294114f1.zip | |
Remove duplicate write of openrc
Use KEYSTONE_PUBLIC_SERVICE_HOST in favor of
KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR
Change-Id: Icea714e4c207a1f518faf7bda8235d4f0bc9e3f9
| -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 - |