diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/nova-compute/nova-compute/start.sh index 45946332de..b1d10c4d80 100755 --- a/docker/nova-compute/nova-compute/start.sh +++ b/docker/nova-compute/nova-compute/start.sh @@ -1,48 +1,44 @@ #!/bin/sh -: ${NOVA_DB_USER:=nova} -: ${NOVA_DB_NAME:=nova} -: ${KEYSTONE_AUTH_PROTOCOL:=http} +. /opt/kolla/kolla-common.sh + : ${NOVA_KEYSTONE_USER:=nova} : ${ADMIN_TENANT_NAME:=admin} -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_SERVICE_HOST -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi +cfg=/etc/nova/nova.conf -if ! [ "$NOVA_DB_PASSWORD" ]; then - NOVA_DB_PASSWORD=$(openssl rand -hex 15) - export NOVA_DB_PASSWORD -fi +crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" +crudini --sel $cfg DEFAULT log_file "" +crudini --del $cfg DEFAULT log_dir +crudini --set $cfg DEFAULT use_stderr True +crudini --set $cfg \ + libvirt \ + connection_uri \ + "qemu+tcp://${NOVA_PORT_16509_TCP_PORT}/system" -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ - -p${DB_ROOT_PASSWORD} mysql <