From: Zane Bitter <zbitter@redhat.com>
Date: Sun, 15 Jul 2012 20:18:22 +0000 (-0400)
Subject: Allow non-interactive installation of OpenStack
X-Git-Tag: 2014.1~1595
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0670b7c3d31bc6ebb47ee121cda4205ae51c3f91;p=openstack-build%2Fheat-build.git

Allow non-interactive installation of OpenStack

Pass the arguments to the tools/openstack script through to openstack-db so
that scripts can use e.g. --yes and --rootpw.

Also use openstack-db --drop rather than heat-db-drop to drop the databases
for OpenStack services.

Change-Id: I87811ee02d3bfd7cc2dca8b9ab20ea3cfc220e3e
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/tools/openstack b/tools/openstack
index a8fad8a0..b4e9a599 100755
--- a/tools/openstack
+++ b/tools/openstack
@@ -95,9 +95,9 @@ function os_erase() {
     sudo systemctl start mysqld.service
     sleep 1
 
-    $BASE_DIR/heat-db-drop nova $*
-    $BASE_DIR/heat-db-drop keystone $*
-    $BASE_DIR/heat-db-drop glance $*
+    sudo openstack-db --service nova --drop $*
+    sudo openstack-db --service glance --drop $*
+    sudo openstack-db --service keystone --drop $*
 
     sudo vgchange -an nova-volumes
     sudo losetup -d /dev/loop0
@@ -115,9 +115,9 @@ function os_install() {
     sudo systemctl start mysqld.service
     sleep 1
     # Configure the databases
-    sudo openstack-db --service nova --init
-    sudo openstack-db --service glance --init
-    sudo openstack-db --service keystone --init
+    sudo openstack-db --service nova --init $*
+    sudo openstack-db --service glance --init $*
+    sudo openstack-db --service keystone --init $*
 
     # Create a keystone RC file
     mkdir -p $HOME/.openstack