Merge "Stop installing Octavia in OVN jobs" into stable/ussuri

zuul.d/tempest-multinode.yaml

@@ -92,7 +92,6 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-tempest-plugin
-      - openstack/octavia
       - openstack/tempest
     irrelevant-files: *irrelevant-files
     roles:
@@ -125,7 +124,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
-        octavia: https://opendev.org/openstack/octavia
       zuul_copy_output:
         '{{ devstack_base_dir }}/data/ovs': 'logs'
       extensions_to_txt:
@@ -136,11 +134,8 @@
         br-ex-tcpdump: true
         br-int-flows: true
         q-ovn-metadata-agent: true
-        o-api: true
-        o-hk: true
         ovn-controller: true
         ovn-northd: true
-        ovn-octavia: true
         ovs-vswitchd: true
         ovsdb-server: true
         placement-api: true
@@ -164,7 +159,6 @@
         devstack_services:
           ovn-controller: true
           ovn-northd: false
-          ovn-octavia: false
           ovs-vswitchd: true
           ovsdb-server: true
           # NOTE(slaweq): it's just to check if this will force devstack to

zuul.d/tempest-singlenode.yaml

@@ -153,7 +153,6 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-tempest-plugin
-      - openstack/octavia
       - openstack/tempest
     irrelevant-files: *irrelevant-files
     vars: &ovn-base-vars
@@ -219,7 +218,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
-        octavia: https://opendev.org/openstack/octavia
       zuul_copy_output:
         '{{ devstack_base_dir }}/data/ovs': 'logs'
       extensions_to_txt:
@@ -243,11 +241,8 @@
         n-sch: true
         n-super-cond: true
         q-ovn-metadata-agent: true
-        o-api: true
-        o-hk: true
         ovn-controller: true
         ovn-northd: true
-        ovn-octavia: true
         ovs-vswitchd: true
         ovsdb-server: true
         placement-api: true