Merge pull request #668 from stackhpc/enable_ovn

[INFRA-351] enable ML2/OVN and DVR by default
stackhpc · Oct 5, 2023 · 6041c9b · 6041c9b
2 parents 9b81e7e + 3dc840a
commit 6041c9b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/etc/kayobe/environments/aufn-ceph/kolla.yml b/etc/kayobe/environments/aufn-ceph/kolla.yml
@@ -13,5 +13,4 @@ kolla_overcloud_inventory_custom_services: "{{ lookup('template', kayobe_env_con
 ###############################################################################
 # Kolla feature flag configuration.
 kolla_enable_cinder: true
-kolla_enable_ovn: true
 kolla_enable_neutron_provider_networks: true
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -23,7 +23,6 @@ kolla_enable_mariabackup: true
 kolla_enable_neutron_sriov: true
 kolla_enable_octavia: true
 kolla_enable_opensearch: true
-kolla_enable_ovn: true
 kolla_enable_prometheus: true
 kolla_enable_redis: true
 kolla_enable_skydive: true

diff --git a/etc/kayobe/environments/ci-multinode/kolla.yml b/etc/kayobe/environments/ci-multinode/kolla.yml
@@ -2,7 +2,6 @@
 kolla_enable_cinder: true
 kolla_enable_cinder_backup: true
 kolla_enable_neutron_provider_networks: true
-kolla_enable_ovn: true
 kolla_enable_octavia: true
 kolla_enable_magnum: true
 kolla_enable_designate: true

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -595,7 +595,7 @@ kolla_enable_mariabackup: True
 #kolla_enable_openvswitch:
 #kolla_enable_osprofiler:
 #kolla_enable_outward_rabbitmq:
-#kolla_enable_ovn:
+kolla_enable_ovn: yes
 #kolla_enable_ovs_dpdk:
 #kolla_enable_placement:
 kolla_enable_prometheus: true

diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
@@ -51,3 +51,4 @@ prometheus_instance_label: "{% raw %}{{ ansible_facts.hostname }}{% endraw %}"
 
 #############################################################################
 
+neutron_ovn_distributed_fip: true
diff --git a/releasenotes/notes/enable_ovn-b84974f398242dcb.yaml b/releasenotes/notes/enable_ovn-b84974f398242dcb.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Enabled ML2/OVN by default as checks preventing accidental migration
+    from ML2/OVS were added in kolla-ansible. If you are using a Neutron
+    plugin other than ML2/OVN, set `kolla_enable_ovn` to `false`.
+    OVN distributed FIP is also enabled, to disable it set
+    `neutron_ovn_distributed_fip` to `false` in `etc/kayobe/kolla/globals.yml`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,4 @@ prometheus_instance_label: "{% raw %}{{ ansible_facts.hostname }}{% endraw %}"

		#############################################################################

		neutron_ovn_distributed_fip: true