openstack/grenade
Code Issues Proposed changes

Make all services optionals except keystone

Browse Source 
Change-Id: I2cb3c75bdd738a8e19796456f0aed14237ef755e
This commit is contained in:
Mehdi Abaakouk 2016-06-29 10:23:59 +02:00
parent 84f5a7be89
commit b4caa4d0e6
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grenade.sh
View File

@ -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

6
projects/40_glance/settings
View File

@ -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

6
projects/60_nova/settings
View File

@ -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

4
projects/80_horizon/settings
View File

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

13
save-state
View File

@ -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
# ------------------