Fix networking-baremetal CI

Force the use of the legacy neutron devstack plugin.

Change the devstack job to use a provider network for
the public network and set bridge mapping for the
public network to fix tempest jobs that fail to
connect to instances via floating IP.

Additionally, devstack changes have resulted in
our authentication configuration setup being
incorrect. This patch calls the correct method.

Also bump the number of test VMs to 4, as more tests
have been added and slightly greater concurrency is
required.

And disable cleaning to save time in CI. While cleaning
is a separate network and series of attach/detaches for
for the underlying ports, we already perform the same
actions with deployment.

Change-Id: I4ae6eb6345ff45b91f63f1687d1c640f9bf25e54
Related-Bug: 1821058

devstack/lib/networking-baremetal

@@ -44,7 +44,7 @@ function configure_networking_baremetal {
 }
 
 function configure_networking_baremetal_neutron_agent {
-    configure_auth_token_middleware $NEUTRON_CONF ironic $NEUTRON_AUTH_CACHE_DIR ironic
+    configure_keystone_authtoken_middleware $NEUTRON_CONF ironic ironic
     configure_placement_nova_compute $NEUTRON_CONF
 }
 

zuul.d/networking-baremetal-jobs.yaml

@@ -8,7 +8,7 @@
       - ^test-requirements.txt$
       - ^tools/.*$
       - ^tox.ini$
-    timeout: 5400
+    timeout: 7200
     required-projects:
       - openstack/networking-generic-switch
       - openstack/networking-baremetal
@@ -31,15 +31,18 @@
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
         IRONIC_USE_LINK_LOCAL: True
         IRONIC_USE_NEUTRON_SEGMENTS: True
-        IRONIC_VM_COUNT: 3
+        IRONIC_VM_COUNT: 4
         IRONIC_VM_EPHEMERAL_DISK: 0
+        IRONIC_AUTOMATED_CLEAN_ENABLED: False
         OVS_PHYSICAL_BRIDGE: brbm
+        Q_USE_PROVIDERNET_FOR_PUBLIC: True
+        PUBLIC_PHYSICAL_NETWORK: public
+        OVS_BRIDGE_MAPPINGS: mynetwork:brbm,public:br-ex
         PHYSICAL_NETWORK: mynetwork
         Q_ML2_TENANT_NETWORK_TYPE: vlan
         Q_PLUGIN: ml2
         Q_SERVICE_PLUGIN_CLASSES: neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,segments
         Q_USE_DEBUG_COMMAND: True
-        Q_USE_PROVIDERNET_FOR_PUBLIC: False
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
         TENANT_VLAN_RANGE: 100:150
@@ -54,6 +57,18 @@
         generic_switch: True
         networking_baremetal: True
         ir-neutronagt: True
+        neutron-api: False
+        neutron-agent: False
+        neutron-dhcp: False
+        neutron-l3: False
+        neutron-metadata-agent: False
+        neutron-metering: False
+        q-agt: True
+        q-dhcp: True
+        q-l3: True
+        q-meta: True
+        q-metering: True
+        q-svc: True
 
 
 - job:

zuul.d/project.yaml

@@ -8,13 +8,11 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - networking-baremetal-multitenant-vlans:
-            voting: false
-        - networking-baremetal-multitenant-vlans-python2:
-            voting: false
+        - networking-baremetal-multitenant-vlans
+        - networking-baremetal-multitenant-vlans-python2
         - openstack-tox-lower-constraints
     gate:
       jobs:
-        # - networking-baremetal-multitenant-vlans
-        # - networking-baremetal-multitenant-vlans-python2
+        - networking-baremetal-multitenant-vlans
+        - networking-baremetal-multitenant-vlans-python2
         - openstack-tox-lower-constraints