Add neutron plugin to octavia-dsvm-base job
With octavia_create_network_interface_device() being in
the neutron tree, we have to enable the neutron plugin
in more jobs to have it visible, else o-hm0 will not
get created and it will fail.
Moved the occurence in the ipv6-only job to the parent
definition as well.
Change-Id: I0d15dbae9034ab17de69d884e8f57df0d25d4338
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0918602..8d4ae71 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -115,6 +115,7 @@
devstack_plugins:
octavia: https://opendev.org/openstack/octavia.git
octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git
+ neutron: https://opendev.org/openstack/neutron.git
tempest_plugins:
- octavia-tempest-plugin
@@ -171,6 +172,7 @@
devstack_plugins:
octavia: https://opendev.org/openstack/octavia.git
octavia-tempest-plugin: https://opendev.org/openstack/octavia-tempest-plugin.git
+ neutron: https://opendev.org/openstack/neutron.git
tempest_plugins:
- octavia-tempest-plugin
@@ -205,8 +207,6 @@
not_implemented_is_error: True
devstack_services:
neutron-qos: true
- devstack_plugins:
- neutron: https://opendev.org/openstack/neutron.git
zuul_copy_output:
'/var/log/dib-build' : logs
'/var/log/octavia-amphora.log': logs
@@ -239,8 +239,6 @@
check_timeout: 180
devstack_services:
neutron-qos: true
- devstack_plugins:
- neutron: https://opendev.org/openstack/neutron.git
zuul_copy_output:
'/var/log/dib-build' : logs
'/var/log/octavia-amphora.log': logs