diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-16 11:20:09 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-16 11:51:50 -0400 |
| commit | 60631ac069af68f047c01d9247e1fd8eecacde47 (patch) | |
| tree | 990c4e960d2dc0c84ed06f3c04658ae7340c96e0 | |
| parent | 558dcb5f56cf52a949fecc580ef1e359a1c6cb30 (diff) | |
| download | kolla-60631ac069af68f047c01d9247e1fd8eecacde47.tar.gz kolla-60631ac069af68f047c01d9247e1fd8eecacde47.zip | |
have start.sh source in common configuration script
Change-Id: I90fcd6ed43ce6c2b224eb43492586c8f4231ceda
| -rw-r--r-- | docker/nova-controller/nova-api/start.sh | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index a8f077bc1..f2419549f 100644 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -1,32 +1,24 @@ #!/bin/sh -: ${NOVA_DB_USER:=nova} -: ${NOVA_DB_NAME:=nova} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${NOVA_KEYSTONE_USER:=admin} -: ${NOVA_ADMIN_PASSWORD:=kolla} -: ${ADMIN_TENANT_NAME:=admin} +set -e -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi +. /opt/kolla/config-nova.sh -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi - -if ! [ "$NOVA_DB_PASSWORD" ]; then - NOVA_DB_PASSWORD=$(openssl rand -hex 15) - export NOVA_DB_PASSWORD -fi +check_for_keystone export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" + +crux user-create --update \ + -n "${NOVA_KEYSTONE_USER}" \ + -p "${NOVA_KEYSTONE_PASSWORD}" \ + -t "${ADMIN_TENANT_NAME}" \ + -r admin -/usr/bin/keystone user-create --name ${NOVA_KEYSTONE_USER} --pass ${NOVA_ADMIN_PASSWORD} -/usr/bin/keystone role-create --name ${NOVA_KEYSTONE_USER} -/usr/bin/keystone user-role-add --user ${NOVA_KEYSTONE_USER} --role admin --tenant ${ADMIN_TENANT_NAME} +crux endpoint-create --remove-all \ + -n glance -t image \ + -I "http://${NOVA_API_SERVICE_HOST}:9292" \ + -P "http://${PUBLIC_IP}:9292" \ + -A "http://${NOVA_API_SERVICE_HOST}:9292" exec /usr/bin/nova-api |