Merge "only force off KEYSTONE_USE_WSGI up until kilo"

2015-05-18 14:59:09 +00:00
parent a84e6848e5 0911c9f3de
commit ef4a2a5e47
1 changed files with 7 additions and 1 deletions
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -320,7 +320,13 @@ EOF
        fi
        # keystone deployed with mod wsgi cannot be upgraded or migrated
        # until https://launchpad.net/bugs/1365105 is resolved.
-        echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
+        case $GRENADE_BASE_BRANCH in
+            "stable/icehouse")
+                ;&
+            "stable/juno")
+                echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
+                ;;
+        esac
    fi

    if [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]]; then