Merge "Configure PKI cache dirs"
diff --git a/functions b/functions
index dbe9d30..9500b2c 100644
--- a/functions
+++ b/functions
@@ -570,7 +570,7 @@
# is_set env-var
function is_set() {
local var=\$"$1"
- if eval "[ -z $var ]"; then
+ if eval "[ -z \"$var\" ]"; then
return 1
fi
return 0
diff --git a/lib/nova b/lib/nova
index b9afa3d..2f19791 100644
--- a/lib/nova
+++ b/lib/nova
@@ -311,6 +311,8 @@
add_nova_opt "enabled_apis=$NOVA_ENABLED_APIS"
fi
if is_service_enabled n-vol; then
+ NOVA_ENABLED_APIS="${NOVA_ENABLED_APIS},osapi_volume"
+ iniset $NOVA_CONF DEFAULT enabled_apis $NOVA_ENABLED_APIS
add_nova_opt "volume_api_class=nova.volume.api.API"
add_nova_opt "volume_group=$VOLUME_GROUP"
add_nova_opt "volume_name_template=${VOLUME_NAME_PREFIX}%s"
diff --git a/stack.sh b/stack.sh
index af8fbf6..a13c4c4 100755
--- a/stack.sh
+++ b/stack.sh
@@ -338,7 +338,7 @@
Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}
# Use namespace or not
Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}
-Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP=:-True}
+Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
# Meta data IP
Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP}
@@ -935,9 +935,6 @@
if is_service_enabled cinder; then
configure_cinder
fi
-if is_service_enabled tempest; then
- configure_tempest
-fi
if is_service_enabled ryu || (is_service_enabled quantum && [[ "$Q_PLUGIN" = "ryu" ]]); then
setup_develop $RYU_DIR
fi
@@ -2055,6 +2052,13 @@
fi
+# Configure Tempest last to ensure that the runtime configuration of
+# the various OpenStack services can be queried.
+if is_service_enabled tempest; then
+ configure_tempest
+fi
+
+
# Run local script
# ================
diff --git a/stackrc b/stackrc
index e587efa..283b271 100644
--- a/stackrc
+++ b/stackrc
@@ -18,7 +18,7 @@
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit
# Set the default Nova APIs to enable
-NOVA_ENABLED_APIS=ec2,osapi_compute,osapi_volume,metadata
+NOVA_ENABLED_APIS=ec2,osapi_compute,metadata
# Repositories
# ------------