openstack/deb-sahara
Code Issues Proposed changes

Merge "Fix grenade"

Browse Source
This commit is contained in:
Jenkins 2016-05-16 21:17:11 +00:00 committed by Gerrit Code Review
commit 3f86f07e23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/upgrade/settings
View File

@ -14,7 +14,7 @@ devstack_localrc base IMAGE_URLS=\
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc base enable_plugin sahara \ devstack_localrc base enable_plugin sahara \
git://git.openstack.org/openstack/sahara \ git://git.openstack.org/openstack/sahara \
stable/liberty stable/mitaka
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec" devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec"
devstack_localrc target disable_service n-net devstack_localrc target disable_service n-net
devstack_localrc target enable_service \ devstack_localrc target enable_service \

3
devstack/upgrade/shutdown.sh
View File

@ -16,7 +16,8 @@ source ${GITDIR[sahara]}/devstack/plugin.sh
set -o xtrace set -o xtrace
export ENABLED_SERVICES+=,sahara-api,sahara-eng,
stop_sahara stop_sahara
# sanity check that service is actually down # sanity check that service is actually down
ensure_services_stopped sahara-all ensure_services_stopped sahara-api sahara-eng