From 33fc1efab2172ce83e61c0af49dcca64fafdfcaf Mon Sep 17 00:00:00 2001
From: Samuel de Medeiros Queiroz <samuel@lsd.ufcg.edu.br>
Date: Mon, 4 May 2015 21:50:53 -0300
Subject: [PATCH] Remove arbitrary devstack config options

Use the var DEVSTACK_LOCAL_CONFIG in project-cofig
job templates to pass through arbitrary devstack
config options.

This change reverts some devstack-gate options in
favor of passing them directly to devstack.

Depends-On: I01dc762f0ba1bc52bdeb5c434039bd5ab30cce1e
Change-Id: Ib5e6f081201855ad5fc5fd97323811c035654601
---
 devstack-vm-gate-wrap.sh | 10 ----------
 devstack-vm-gate.sh      | 16 ----------------
 2 files changed, 26 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 462a9c14..f3199e03 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -225,19 +225,9 @@ export DEVSTACK_GATE_ZAQAR=${DEVSTACK_GATE_ZAQAR:-0}
 # Set to 0 to disable config_drive and use the metadata server instead
 export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
 
-# Set to 1 to enable running a keystone v3 based gate
-export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
-
 # Set to 1 to enable installing test requirements
 export DEVSTACK_GATE_INSTALL_TESTONLY=${DEVSTACK_GATE_INSTALL_TESTONLY:-0}
 
-# Set to 0 to run services that default under Apache + mod_wsgi under alternatives (e.g. eventlet)
-# if possible
-export DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES=${DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES:-1}
-
-# Set to 1 to replace Nova V2 endpoint with V2.1 API
-export DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API=${DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API:-0}
-
 # Set the number of threads to run tempest with
 DEFAULT_CONCURRENCY=$(nproc)
 if [ ${DEFAULT_CONCURRENCY} -gt 3 ] ; then
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index e4934b26..a980c437 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -338,18 +338,6 @@ EOF
     else
         echo "FORCE_CONFIG_DRIVE=False" >>"$localrc_file"
     fi
-    if [[ "$DEVSTACK_GATE_KEYSTONE_V3" -eq "1" ]]; then
-        # Run gate using only keystone v3
-        # For now this is only injected in tempest configuration
-        echo "TEMPEST_AUTH_VERSION=v3" >>"$localrc_file"
-    fi
-
-    if [[ "$DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES" -eq "0" ]]; then
-        # Services that default to run under Apache + mod_wsgi will use alternatives
-        # (e.g. Keystone under eventlet) if available. This will affect all services
-        # that run under HTTPD (mod_wsgi) by default.
-        echo "ENABLE_HTTPD_MOD_WSGI_SERVICES=False" >> "$localrc_file"
-    fi
 
     if [[ "$CEILOMETER_NOTIFICATION_TOPICS" ]]; then
         # Add specified ceilometer notification topics to localrc
@@ -357,10 +345,6 @@ EOF
         echo "CEILOMETER_NOTIFICATION_TOPICS=$CEILOMETER_NOTIFICATION_TOPICS" >>"$localrc_file"
     fi
 
-    if [[ "$DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API" -eq "1" ]]; then
-        echo "NOVA_API_VERSION=v21default" >> "$localrc_file"
-    fi
-
     if [[ "$DEVSTACK_GATE_INSTALL_TESTONLY" -eq "1" ]]; then
         # Sometimes we do want the test packages
         echo "INSTALL_TESTONLY_PACKAGES=True" >> "$localrc_file"