Ironic to use DevStack's neutron"-legacy" module

In the last PTG the Neutron team discussed and decided to undeprecate
the neutron-legacy module in DevStack because that's the module being
used (almost) everywhere and it works. The lib/neutron was an attempt
to refactor the old module but, in the last few years it hasn't gained
any traction and due to the lack of features and people to work on it,
it's going to be removed from DevStack eventually.

Below is a snippet from the PTG summary email [0] about this topic:

<snippet>
In Devstack there are currently 2 modules which can configure
Neutron. Old one called "lib/neutron-legacy" and the new one called
"lib/neutron". It is like that since many cycles that "lib/neutron-legacy"
is deprecated. But it is still used everywhwere. New module isn't still
finished and isn't working fine.  This is very confusing for users as
really maintained and recommended is still "lib/neutron-legacy" module.

During the discussion Sean Collins explained us that originally this
new module was created as an attempt to refactor old module, and to
make Neutron in the Devstack better to maintain. But now we see that
this process failed as new module isn't still used and we don't have
any cycles to work on it. So our final conclusion is to "undeprecate"
old "lib/neutron-legacy" and get rid of the new module.
</snippet>

This patch changes the Ironic jobs to use the old Neutron module in
DevStack.

[0]
http://lists.openstack.org/pipermail/openstack-discuss/2020-June/015368.html
[1]
http://codesearch.openstack.org/?q=neutron-api%3A%20true&i=nope&files=&repos=

Change-Id: Ief043a0a01a800ea2d01a602000f0854df9e629f
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>

1 files changed, 12 insertions, 32 deletions

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index d503954c2..d9749bdd3 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -65,18 +65,12 @@
         '{{ devstack_base_dir }}/ironic-bm-logs': 'logs'
         '{{ devstack_base_dir }}/data/networking-generic-switch/netmiko_session.log': 'logs'
       devstack_services:
-        q-agt: false
-        q-dhcp: false
-        q-l3: false
-        q-meta: false
-        q-metering: false
-        q-svc: false
-        neutron-api: true
-        neutron-agent: true
-        neutron-dhcp: true
-        neutron-l3: true
-        neutron-metadata-agent: true
-        neutron-metering: true
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-metering: true
+        q-svc: true
 
         c-api: False
         c-bak: False
@@ -449,12 +443,6 @@
         q-meta: False
         q-metering: False
         q-svc: False
-        neutron-api: False
-        neutron-agent: False
-        neutron-dhcp: False
-        neutron-l3: False
-        neutron-metadata-agent: False
-        neutron-metering: False
 
 - job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
@@ -703,19 +691,12 @@
       devstack_services:
         # NOTE(TheJulia): It seems our devstack plugin does not play well
         # with multitenancy and the newer neutron service names.
-        neutron: True
-        neutron-api: True
-        neutron-agent: True
-        neutron-dhcp: True
-        neutron-l3: True
-        neutron-metadata-agent: False
-        neutron-metering: False
-        q-agt: False
-        q-dhcp: False
-        q-l3: False
+        q-agt: True
+        q-dhcp: True
+        q-l3: True
         q-meta: False
         q-metering: False
-        q-svc: False
+        q-svc: True
         swift: True
       devstack_plugins:
         ironic: https://opendev.org/openstack/ironic
@@ -734,8 +715,8 @@
         IRONIC_IPXE_ENABLED: True
         IRONIC_PROVISION_NETWORK_NAME: ironic-provision
         OVS_PHYSICAL_BRIDGE: brbm
-        NEUTRON_PHYSICAL_NETWORK: mynetwork
-        NEUTRON_TENANT_VLAN_RANGE: 100:150
+        PHYSICAL_NETWORK: mynetwork
+        TENANT_VLAN_RANGE: 100:150
         IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
         IRONIC_NETWORK_INTERFACE: neutron
         IRONIC_DEFAILT_DEPLOY_INTERFACE: direct
@@ -749,7 +730,6 @@
         Q_PLUGIN: ml2
         ENABLE_TENANT_VLANS: True
         Q_ML2_TENANT_NETWORK_TYPE: vlan
-        NEUTRON_TENANT_NETWORK_TYPE: vlan
         OVS_BRIDGE_MAPPINGS: "public:br-ex,mynetwork:brbm"
         USE_PROVIDER_NETWORKING: True
         PUBLIC_PHYSICAL_NETWORK: public