aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-controller/nova-conductor
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-14 01:23:49 +0000
committerGerrit Code Review <review@openstack.org>2014-10-14 01:23:49 +0000
commit8fbe677d58d2c564c7d5d5acacf104f8bbb8c7cb (patch)
treecbfc6818446afa05552750c943f1912d874699c8 /docker/nova-controller/nova-conductor
parent5dd0e4d9580cf2446b84ce13a419240c77b80eae (diff)
parent6b51f3580340afa4c2f56b80d95989474ad7f56c (diff)
downloadkolla-8fbe677d58d2c564c7d5d5acacf104f8bbb8c7cb.tar.gz
kolla-8fbe677d58d2c564c7d5d5acacf104f8bbb8c7cb.zip
Merge "Nova-controller config setup"
Diffstat (limited to 'docker/nova-controller/nova-conductor')
-rw-r--r--docker/nova-controller/nova-conductor/start.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh
index 38775c3d8..9edf92015 100644
--- a/docker/nova-controller/nova-conductor/start.sh
+++ b/docker/nova-controller/nova-conductor/start.sh
@@ -34,6 +34,8 @@ EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
+crudini --set /etc/nova/nova.conf DEFAULT sql_connection "mysql://nova:${NOVA_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/nova"
+
/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}