diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-16 11:48:40 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-16 11:51:59 -0400 |
| commit | b4560bd0e3e8905bba544cbb95a9dab11f1a8a15 (patch) | |
| tree | dd5964d6cd3da8658a97b6b4d95ef64de4d046d0 | |
| parent | 1eba53eb13f79ee155c59db94ecb31e0a9c9cbe1 (diff) | |
| download | kolla-b4560bd0e3e8905bba544cbb95a9dab11f1a8a15.tar.gz kolla-b4560bd0e3e8905bba544cbb95a9dab11f1a8a15.zip | |
introduce scheduler to common configuration
Change-Id: I56156ed59b6678180bcb5d1bdd00233d8f339643
| -rw-r--r-- | docker/nova-controller/nova-scheduler/start.sh | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index 8ca13b66e..af5c8c338 100644 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -1,41 +1,7 @@ #!/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 - -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 - -sh /opt/nova/config-nova.sh scheduler - -mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \ - -p${DB_ROOT_PASSWORD} mysql <<EOF -CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME}; -GRANT ALL PRIVILEGES ON nova* TO - '${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}' -EOF - -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0" - -/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} +. /opt/kolla/config-nova-controller.sh exec /usr/bin/nova-scheduler |