openstack
/
grenade
Code Issues Proposed changes

Merge "Get grenade working for ocata->pike and pike->master"

This commit is contained in:
Jenkins 2017-08-16 21:35:57 +00:00 committed by Gerrit Code Review
parent e6367a7977 eeed61bcff
commit d225945275
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
grenade.sh
View File

@ -219,13 +219,22 @@ load_settings
# isn't run there. This has to be run after load_settings because
# plugins might change the service list during this phase.
# Remove in Queens
# Set WSGI_MODE to mod_wsgi
# Make sure we use the same configurations across base and target
# by being explicit. Nova, Cinder, Keystone should use Apache2/mod_wsgi
# we should revisit these in Queens
devstack_localrc base "WSGI_MODE=mod_wsgi"
devstack_localrc target "WSGI_MODE=mod_wsgi"
# Don't let Nova and Cinder use WSGI
devstack_localrc base "NOVA_USE_MOD_WSGI=False"
devstack_localrc target "NOVA_USE_MOD_WSGI=False"
devstack_localrc base "CINDER_USE_MOD_WSGI=False"
devstack_localrc target "CINDER_USE_MOD_WSGI=False"
# Nova should use singleconductor as Grenade doesn't
# setup multi-cell rabbit for now
devstack_localrc base "CELLSV2_SETUP=singleconductor"
devstack_localrc target "CELLSV2_SETUP=singleconductor"
extract_localrc_section $TARGET_DEVSTACK_DIR/local.conf \
$TARGET_DEVSTACK_DIR/localrc \
$TARGET_DEVSTACK_DIR/.localrc.auto
@ -244,6 +253,17 @@ if [[ "$RUN_BASE" == "True" ]]; then
echo_summary "Running post-stack.sh"
if [[ -e $GRENADE_DIR/post-stack.sh ]]; then
cd $GRENADE_DIR
# By the time we get here the sub nodes are already setup with localrc files
# as those are transferred in devstack-gate even before grenade.sh is called
# We hack the ./post-stack.sh to inject what we need. if we don't set
# CELLSV2_SETUP, the default devstack assumes "superconductor" and fails. if
# we don't set WSGI_MODE, cinder fails to glance as the glance url is not
# set up correctly
export SUB_NODE_ENV_VARS="WSGI_MODE=mod_wsgi CELLSV2_SETUP=singleconductor"
sed -i 's/stdbuf/$SUB_NODE_ENV_VARS stdbuf/' ./post-stack.sh
cat ./post-stack.sh
./post-stack.sh
stop $STOP post-stack.sh 15
echo_summary "Completed post-stack.sh"

3
projects/60_nova/shutdown.sh
View File

@ -17,6 +17,9 @@ source $BASE_DEVSTACK_DIR/lib/nova
set -o xtrace
stop_nova
# FIXME(dims): Once devstack gets fixed in both master and stable
# branches, we can remove this extra stop_process
stop_process n-cond
# TODO(sdague): list all the services
SERVICES_DOWN="nova-api nova-conductor nova-scheduler nova-compute"