From ea45d6aa6fcd89a9f504152b40df0948eac92005 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Tue, 7 Oct 2014 12:37:31 -0700
Subject: Modify start.sh for nova-compute/nova-compute

This should get us a working nova-compute.  Once rabbitmq is operational
we can further debug and implement this container.

Change-Id: I0768b9f33bc43748f4e08da0edc111d669895cc8
---
 docker/nova-compute/nova-compute/start.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/nova-compute/nova-compute/start.sh
index 45a17bc4e..45946332d 100755
--- a/docker/nova-compute/nova-compute/start.sh
+++ b/docker/nova-compute/nova-compute/start.sh
@@ -21,8 +21,6 @@ if ! [ "$NOVA_DB_PASSWORD" ]; then
 	export NOVA_DB_PASSWORD
 fi
 
-sh /opt/nova/config-nova.sh compute
-
 mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
 	-p${DB_ROOT_PASSWORD} mysql <<EOF
 CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
@@ -30,6 +28,16 @@ GRANT ALL PRIVILEGES ON nova* TO
 	'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
 EOF
 
+crudini --set /etc/nova/nova database connection \
+    "mysql://nova:${NOVA_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/nova"
+crudini --set /etc/nova/nova DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}"
+crudini --del /etc/nova/nova DEFAULT log_file
+crudini --del /etc/nova/nova  DEFAULT log_dir
+crudini --set /etc/nova/nova DEFAULT use_stderr True
+crudini --set /etc/keystone/keystone.conf libvirt connection_uri qemu+tcp://${NOVA_PORT_16509_TCP_PORT}/system
+
+/usr/bin/nova-manage db_sync
+
 export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
 export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
 
-- 
cgit v1.2.3