From a78e3dc4f4d3c3b6be7964c25129a95303a87dae Mon Sep 17 00:00:00 2001 From: sayalilunkad Date: Wed, 19 Nov 2014 17:04:26 +0530 Subject: [PATCH] Refactors glance setup section in osbash This patch adds some operations in the setup_glance script to match the install guides. Change-Id: I0c2339123d4d973dc4dceac62be89bf5ad581c48 --- labs/scripts/setup_glance.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/labs/scripts/setup_glance.sh b/labs/scripts/setup_glance.sh index d5210e63..96c3f998 100755 --- a/labs/scripts/setup_glance.sh +++ b/labs/scripts/setup_glance.sh @@ -14,10 +14,7 @@ indicate_current_auto #------------------------------------------------------------------------------ echo "Installing glance." -sudo apt-get install -y glance - -echo "Setting up database for glance." -setup_database glance +sudo apt-get install -y glance python-glanceclient function get_database_url { local db_user=$(service_to_db_user glance) @@ -29,12 +26,18 @@ function get_database_url { database_url=$(get_database_url) -echo "Configuring glance." - echo "Setting database connection: $database_url." iniset_sudo /etc/glance/glance-api.conf database connection "$database_url" iniset_sudo /etc/glance/glance-registry.conf database connection "$database_url" +echo "Removing default SQLite database." +sudo rm -f /var/lib/glance/glance.sqlite + +echo "Setting up database for glance." +setup_database glance + +echo "Configuring glance." + # TODO: Should we configure the rpc_backend (glance-api.conf) here? echo "Creating the database tables for glance."