From 8768d5d77a1a1b5f65e0856cfa41dc2861590200 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Tue, 28 Apr 2015 13:12:28 +0000
Subject: openstack: enable glance only in the controller

Change-Id: I506525f48952b1807732fb726aa16f9f33e608d7
---
 openstack-glance.configure | 48 ++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

(limited to 'openstack-glance.configure')

diff --git a/openstack-glance.configure b/openstack-glance.configure
index 44b4d6aa..5da08895 100644
--- a/openstack-glance.configure
+++ b/openstack-glance.configure
@@ -18,28 +18,38 @@ set -e
 
 ROOT="$1"
 
-##########################################################################
+enable(){
+    ln -sf "/usr/lib/systemd/system/$1.service" \
+            "$ROOT/etc/systemd/system/multi-user.target.wants/$1.service"
+}
+
+unnaceptable(){
+    eval echo Unexpected value \$$1 for $1 >&2
+    exit 1
+}
 
-ln -s "/usr/lib/systemd/system/openstack-glance-setup.service" \
-        "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-glance-setup.service"
+check_bool(){
+    case "$(eval echo \"\$$1\")" in
+    True|'')
+        eval "$1=true"
+        ;;
+    False)
+        eval "$1=false"
+        ;;
+    *)
+        unnaceptable "$1"
+        ;;
+    esac
+}
 
 ##########################################################################
 # Check variables
 ##########################################################################
 
-if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \
-     -z "$GLANCE_SERVICE_USER" -a \
-     -z "$GLANCE_SERVICE_PASSWORD" -a \
-     -z "$GLANCE_DB_USER" -a \
-     -z "$GLANCE_DB_PASSWORD" -a \
-     -z "$RABBITMQ_HOST" -a \
-     -z "$RABBITMQ_PORT" -a \
-     -z "$RABBITMQ_USER" -a \
-     -z "$RABBITMQ_PASSWORD" -a \
-     -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \
-     -z "$CONTROLLER_HOST_ADDRESS" ]; then
-     # No Glance options defined, do nothing.
-     exit 0
+check_bool GLANCE_ENABLE_SERVICE
+
+if ! "$GLANCE_ENABLE_SERVICE"; then
+    exit 0
 fi
 
 if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \
@@ -57,6 +67,12 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \
     exit 1
 fi
 
+######################################
+# Enable relevant openstack services #
+######################################
+
+enable openstack-glance-setup
+
 ##########################################################################
 # Generate configuration file
 ##########################################################################
-- 
cgit v1.2.1