Merge "Add ZeroMQ support"

devstack-vm-gate-wrap.sh

@@ -30,6 +30,9 @@ export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
 # Set to 1 to run postgresql instead of mysql
 export DEVSTACK_GATE_POSTGRES=${DEVSTACK_GATE_POSTGRES:-0}
 
+# Set to 1 to use zeromq instead of rabbitmq (or qpid)
+export DEVSTACK_GATE_ZEROMQ=${DEVSTACK_GATE_ZEROMQ:-0}
+
 # Set to 1 to run nova coverage with Tempest
 export DEVSTACK_GATE_TEMPEST_COVERAGE=${DEVSTACK_GATE_TEMPEST_COVERAGE:-0}
 

devstack-vm-gate.sh

@@ -118,6 +118,13 @@ enable_service postgresql
 EOF
     fi
 
+    if [ "$DEVSTACK_GATE_ZEROMQ" -eq "1" ]; then
+        cat <<\EOF >>localrc
+disable_service rabbit
+enable_service zeromq
+EOF
+    fi
+
     if [ "$DEVSTACK_GATE_VIRT_DRIVER" == "openvz" ]; then
         echo "SKIP_EXERCISES=${SKIP_EXERCISES},volumes" >>localrc
         echo "DEFAULT_INSTANCE_TYPE=m1.small" >>localrc