Merge "Make all services optionals except keystone"

grenade.sh

@@ -238,7 +238,10 @@ if [[ "$RUN_BASE" == "True" ]]; then
             rsync -a $BASE_DEVSTACK_DIR/files/$IMAGE_FNAME $BASE_RELEASE_DIR/images
         fi
     done
-    rsync -a $BASE_DEVSTACK_DIR/files/images/ $BASE_RELEASE_DIR/images
+    # NOTE(sileht): If glance is not enabled the directory cannot exists.
+    if [[ -d $BASE_DEVSTACK_DIR/files/images ]] ; then
+        rsync -a $BASE_DEVSTACK_DIR/files/images/ $BASE_RELEASE_DIR/images
+    fi
     stop $STOP image-cache 20
 
     # Operation

projects/40_glance/settings

@@ -1,2 +1,4 @@
-register_project_for_upgrade glance
-register_db_to_save glance
+if is_service_enabled glance; then
+    register_project_for_upgrade glance
+    register_db_to_save glance
+fi

projects/60_nova/settings

@@ -1,2 +1,4 @@
-register_project_for_upgrade nova
-register_db_to_save nova
+if is_service_enabled nova; then
+    register_project_for_upgrade nova
+    register_db_to_save nova
+fi

projects/80_horizon/settings

@@ -1 +1,3 @@
-register_project_for_upgrade horizon
+if is_service_enabled horizon; then
+    register_project_for_upgrade horizon
+fi

save-state

@@ -47,10 +47,15 @@ save_data $BASE_RELEASE $BASE_DEVSTACK_DIR
 # Save ebtables/iptables
 # ----------------------
 
-sudo iptables-save >$SAVE_DIR/iptables.$BASE_RELEASE
-sudo ebtables -t broute -L >$SAVE_DIR/ebtables-broute.$BASE_RELEASE
-sudo ebtables -t filter -L >$SAVE_DIR/ebtables-filter.$BASE_RELEASE
-sudo ebtables -t nat -L >$SAVE_DIR/ebtables-nat.$BASE_RELEASE
+# NOTE(sileht): If nova is not installed this tools are not present
+if [ -x "$(iptable-save)" ]; then
+    sudo iptables-save >$SAVE_DIR/iptables.$BASE_RELEASE
+fi
+if [ -x "$(ebtables)" ]; then
+    sudo ebtables -t broute -L >$SAVE_DIR/ebtables-broute.$BASE_RELEASE
+    sudo ebtables -t filter -L >$SAVE_DIR/ebtables-filter.$BASE_RELEASE
+    sudo ebtables -t nat -L >$SAVE_DIR/ebtables-nat.$BASE_RELEASE
+fi
 
 # Log RabbitMQ state
 # ------------------