Merge "Stop configuring '[DEFAULT] firewall_driver' for nova"
diff --git a/.zuul.yaml b/.zuul.yaml
index 08513c2..cbb9d99 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -401,6 +401,7 @@
key: true
# Glance services
g-api: true
+ g-reg: true
# Nova services
n-api: true
n-api-meta: true
diff --git a/lib/glance b/lib/glance
index 740bcab..b4cab2a 100644
--- a/lib/glance
+++ b/lib/glance
@@ -276,16 +276,18 @@
rm -rf $GLANCE_IMAGE_DIR
mkdir -p $GLANCE_IMAGE_DIR
- # (Re)create glance database
- recreate_database glance
+ if is_service_enabled $DATABASE_BACKENDS; then
+ # (Re)create glance database
+ recreate_database glance
- time_start "dbsync"
- # Migrate glance database
- $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_sync
+ time_start "dbsync"
+ # Migrate glance database
+ $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_sync
- # Load metadata definitions
- $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_load_metadefs
- time_stop "dbsync"
+ # Load metadata definitions
+ $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_load_metadefs
+ time_stop "dbsync"
+ fi
}
# install_glanceclient() - Collect source and prepare
diff --git a/stack.sh b/stack.sh
index dee84fa..089510f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1155,7 +1155,7 @@
# Glance
# ------
-if is_glance_enabled; then
+if is_service_enabled g-reg; then
echo_summary "Configuring Glance"
init_glance
fi
@@ -1280,7 +1280,7 @@
# scripts as userdata.
# See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init``
-if is_glance_enabled; then
+if is_service_enabled g-reg; then
echo_summary "Uploading images"
diff --git a/stackrc b/stackrc
index 9fd7f75..2d3a599 100644
--- a/stackrc
+++ b/stackrc
@@ -69,7 +69,7 @@
# Placement service needed for Nova
ENABLED_SERVICES+=,placement-api,placement-client
# Glance services needed for Nova
- ENABLED_SERVICES+=,g-api
+ ENABLED_SERVICES+=,g-api,g-reg
# Cinder
ENABLED_SERVICES+=,c-sch,c-api,c-vol
# Neutron