openstack/grenade
Code Issues Proposed changes

Always source lib/apache when lib/tls is used

Browse Source 
When tls-proxy is enabled, few functions in lib/tls relies on lib/apache
functions (restart_apache_server, stop_apache_server, enable_apache_site,
enable_apache_mod).
It is thus necessary to source lib/apache whenever lib/tls is used.

Change-Id: Ia9ffdc490d0cba04a084d572312e177b19791585
This commit is contained in:
Luigi Toscano 2019-02-18 12:10:25 +01:00
parent 9fe075e0bb
commit db110f17a2
8 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clean.sh
View File

@ -30,6 +30,7 @@ if [[ -d $BASE_DEVSTACK_DIR ]]; then
bash -c " bash -c "
cd $BASE_DEVSTACK_DIR; \ cd $BASE_DEVSTACK_DIR; \
source stackrc; \ source stackrc; \
source lib/apache; \
source lib/tls; \ source lib/tls; \
source lib/cinder; \ source lib/cinder; \
DATA_DIR=${STACK_ROOT}/data; \ DATA_DIR=${STACK_ROOT}/data; \
@ -47,6 +48,7 @@ if [[ -d $TARGET_DEVSTACK_DIR ]]; then
bash -x -c " bash -x -c "
cd $TARGET_DEVSTACK_DIR; \ cd $TARGET_DEVSTACK_DIR; \
source stackrc; \ source stackrc; \
source lib/apache; \
source lib/tls; \ source lib/tls; \
source lib/cinder; \ source lib/cinder; \
DATA_DIR=${STACK_ROOT}/data; \ DATA_DIR=${STACK_ROOT}/data; \

1
projects/30_swift/shutdown.sh
View File

@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
# We need base DevStack functions for this # We need base DevStack functions for this
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/swift source $BASE_DEVSTACK_DIR/lib/swift

1
projects/30_swift/upgrade.sh
View File

@ -39,6 +39,7 @@ set -o errexit
source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/stackrc
FILES=$TARGET_DEVSTACK_DIR/files FILES=$TARGET_DEVSTACK_DIR/files
source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/keystone source $TARGET_DEVSTACK_DIR/lib/keystone
source $TARGET_DEVSTACK_DIR/lib/swift source $TARGET_DEVSTACK_DIR/lib/swift

1
projects/40_glance/shutdown.sh
View File

@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
# We need base DevStack functions for this # We need base DevStack functions for this
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/glance source $BASE_DEVSTACK_DIR/lib/glance

1
projects/40_glance/upgrade.sh
View File

@ -38,6 +38,7 @@ set -o errexit
# Get functions from current DevStack # Get functions from current DevStack
source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/stackrc
source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/glance source $TARGET_DEVSTACK_DIR/lib/glance

1
projects/50_neutron/shutdown.sh
View File

@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
# We need base DevStack functions for this # We need base DevStack functions for this
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
# TODO(sdague): remove this conditional once we've branched # TODO(sdague): remove this conditional once we've branched
# grenade. Right now we need to support stable/mitaka, stable/newton, # grenade. Right now we need to support stable/mitaka, stable/newton,

1
projects/70_cinder/shutdown.sh
View File

@ -10,6 +10,7 @@ source $GRENADE_DIR/functions
# We need base DevStack functions for this # We need base DevStack functions for this
source $BASE_DEVSTACK_DIR/functions source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/tls source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/cinder source $BASE_DEVSTACK_DIR/lib/cinder

1
projects/70_cinder/upgrade.sh
View File

@ -37,6 +37,7 @@ set -o errexit
# ============== # ==============
source $TARGET_DEVSTACK_DIR/stackrc source $TARGET_DEVSTACK_DIR/stackrc
source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/tls source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/cinder source $TARGET_DEVSTACK_DIR/lib/cinder