Merge "CI: Disable amphora in OVN jobs"

tests/run.yml

@@ -269,7 +269,7 @@
     # same host being used by both)
     - name: create TLS certificates for octavia
       command: kolla-ansible octavia-certificates
-      when: scenario in ['octavia', 'ovn']
+      when: scenario in ['octavia']
 
     # NOTE(mgoddard): We are using the script module here and later to ensure
     # we use the local copy of these scripts, rather than the one on the remote

tests/templates/globals-default.j2

@@ -157,6 +157,9 @@ neutron_plugin_agent: "linuxbridge"
 neutron_plugin_agent: "ovn"
 neutron_ovn_distributed_fip: "yes"
 enable_octavia: "yes"
+octavia_auto_configure: "no"
+octavia_provider_drivers: "ovn:OVN provider"
+octavia_provider_agents: "ovn"
 {% endif %}
 
 {% if scenario == "prometheus-efk" %}