Fix configuration to enable q-domua

1. Set ENABLED_SERVICES in right place, otherwise it cannot tack effect
2. Enable neutron security group as we found if didn't enable it, VMs
   cannot get their fixed IP

Change-Id: I3314f534b0b29aee2c072a2874baee6c092b419d

run_tests.sh

@@ -52,6 +52,7 @@ export DEVSTACK_GATE_CLEAN_LOGS=0
 source /home/jenkins/xenapi-os-testing/tempest_exclusion_list
 if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
     export DEVSTACK_GATE_TEMPEST_REGEX="$NEUTRON_NETWORK_TEMPEST_REGEX"
+    export ENABLED_SERVICES=neutron,q-domua
 else
     export DEVSTACK_GATE_TEMPEST_REGEX="$NOVA_NETWORK_TEMPEST_REGEX"
 fi
@@ -220,9 +221,8 @@ EOF
         # Set localrc for neutron network
         localrc="/opt/stack/new/devstack/localrc"
         cat <<EOF >>"$localrc"
-ENABLED_SERVICES+=",neutron,q-agt,q-domua,q-meta,q-svc,q-dhcp,q-l3,q-metering,-n-net"
 Q_PLUGIN=ml2
-Q_USE_SECGROUP=False
+Q_USE_SECGROUP=True
 ENABLE_TENANT_VLANS="True"
 ENABLE_TENANT_TUNNELS="False"
 Q_ML2_TENANT_NETWORK_TYPE="vlan"
@@ -248,6 +248,10 @@ EOF
 [ovs]
 ovsdb_interface = vsctl
 of_interface = ovs-ofctl
+
+[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini.domU]]
+[ovs]
+bridge_mappings = physnet1:br-eth3,public:br-ex
 EOF
 
     fi