From 64b65eddf7a1e4626c1d03cf65d85ed0062d0082 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Sun, 28 Jun 2015 09:05:05 +0000 Subject: [PATCH] Correct case pattern handling in MOD_WSGI checks 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 f42d6c8a8d39cfc65fb1f5804f84608a0e7eab59 and 5f8b3cb631688ec65629fffaf0f8b7615a16c511 This tries to get the correct the original intent: flat out disable for ceilometer and disable depending on branch for keystone. Change-Id: I9e5e792ef43f9a3cdc0b84c73f27b62109ed5d31 --- devstack-vm-gate.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 089f0001..d1953d73 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -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