diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-03 20:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-03 20:49:00 +0000 |
| commit | 9ce465d544cfecb7f96e7b453d7ad567775da648 (patch) | |
| tree | 5a3fe460c60f61ee912897b3e0caa7a312b5cdf4 /docker/glance/glance-base | |
| parent | 5aa235066c9628540445b0772eb5332877fde594 (diff) | |
| parent | 4592e3884fcbe401d0360003d74b3b0dfb9e4dfc (diff) | |
| download | kolla-9ce465d544cfecb7f96e7b453d7ad567775da648.tar.gz kolla-9ce465d544cfecb7f96e7b453d7ad567775da648.zip | |
Merge "Updates to glance start scripts, db and user/role creation - adding db sync and db creation as utf8 - fixing user and role creation"
Diffstat (limited to 'docker/glance/glance-base')
| -rw-r--r-- | docker/glance/glance-base/config-glance.sh | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index ae15b1a78..2b2ae0473 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -12,8 +12,8 @@ cfg=/etc/glance/glance-${service}.conf : ${ADMIN_TENANT_NAME:=admin} if ! [ "$GLANCE_DB_PASSWORD" ]; then - echo "*** Missing GLANCE_DB_PASSWORD" >&2 - exit 1 + echo "*** Missing GLANCE_DB_PASSWORD" >&2 + exit 1 fi crudini --del $cfg \ @@ -25,9 +25,9 @@ crudini --set $cfg \ "${GLANCE_KEYSTONE_PASS}" for option in auth_protocol auth_host auth_Port; do - crudini --del $cfg \ - keystone_authtoken \ - $option + crudini --del $cfg \ + keystone_authtoken \ + $option done crudini --set $cfg @@ -37,19 +37,18 @@ crudini --set $cfg crudini --set $cfg keystone_authtoken \ admin_tenant_name \ - "${ADMIN_TENANT_NAME}" + "${ADMIN_TENANT_NAME}" crudini --set $cfg keystone_authtoken \ admin_user \ - "${GLANCE_KEYSTONE_USER}" + "${GLANCE_KEYSTONE_USER}" crudini --set $cfg keystone_authtoken \ admin_password \ "${GLANCE_KEYSTONE_PASS}" crudini --set $cfg \ - database \ - connection \ - "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}" - + database \ + connection \ + "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}" |
