openstack/devstack-gate
Code Issues Proposed changes

Correct case pattern handling in MOD_WSGI checks

Browse Source 
If we've got two identical patterns one of them needs to fall
through or have them both in the same block.

It appears there was some merge confusion with
f42d6c8a8d and
5f8b3cb631

This tries to get the correct the original intent: flat out disable
for ceilometer and disable depending on branch for keystone.

Change-Id: I9e5e792ef43f9a3cdc0b84c73f27b62109ed5d31
This commit is contained in:
Chris Dent
2015-06-28 09:05:05 +00:00
parent 8d41d3d3be
commit 64b65eddf7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack-vm-gate.sh
View File

@@ -330,10 +330,6 @@ EOF
;&
"stable/juno")
echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
echo "CEILOMETER_USE_MOD_WSGI=False" >> "$localrc_file"
;;
"stable/kilo")
echo "CEILOMETER_USE_MOD_WSGI=False" >> "$localrc_file"
;;
"stable/kilo")
# while both juno and kilo can run under wsgi, they
@@ -345,6 +341,7 @@ EOF
echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
;;
esac
echo "CEILOMETER_USE_MOD_WSGI=False" >> "$localrc_file"
fi
if [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]]; then