allow configdrive vs. metadata server to be configured

this gives us control of the config drive settings in devstack so
that we can force it off, to ensure that we are using the
metadata server instead for configuring the guests.

Needed because neutron does some extra clever things with the
metadata server setup which got broken because we were defaulting
to config drive in all the runs.

Depends-On: Ic2acb568b55a05b84120b181383ea45ea190dcad

Change-Id: Ib203bb0c812939f32b36731464b18566a187c85a

devstack-vm-gate-wrap.sh

@@ -494,6 +494,9 @@ export DEVSTACK_GATE_IRONIC=${DEVSTACK_GATE_IRONIC:-0}
 # Set to 1 to run savanna
 export DEVSTACK_GATE_SAVANNA=${DEVSTACK_GATE_SAVANNA:-0}
 
+# Set to 0 to disable config_drive and use the metadata server instead
+export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
+
 # The following variables are set for different directions of Grenade updating
 # for a stable branch we want to both try to upgrade forward n => n+1 as
 # well as upgrade from last n-1 => n.

devstack-vm-gate.sh

@@ -206,7 +206,11 @@ EOF
         echo "TEMPEST_LARGE_OPS_NUMBER=150" >>localrc
     fi
 
-
+    if [ "$DEVSTACK_GATE_CONFIGDRIVE" -eq "1" ]; then
+        echo "FORCE_CONFIG_DRIVE=always" >>localrc
+    else
+        echo "FORCE_CONFIG_DRIVE=False" >>localrc
+    fi
 }
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then