rebase to Zed

g0rgamesh · g0rgamesh · commit 806fab56232b · 2023-09-28T13:05:57.000+02:00
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -566,7 +566,7 @@ kolla_enable_mariabackup: True
 #kolla_enable_neutron:
 #kolla_enable_neutron_agent_ha:
 #kolla_enable_neutron_bgp_dragent:
-kolla_enable_neutron_dvr: yes
+#kolla_enable_neutron_dvr:
 #kolla_enable_neutron_horizon_policy_file:
 #kolla_enable_neutron_infoblox_ipam_agent:
 #kolla_enable_neutron_metering:
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

Original file line number	Diff line number	Diff line change
`@@ -51,3 +51,4 @@ prometheus_instance_label: "{% raw %}{{ ansible_facts.hostname }}{% endraw %}"`
`51`	`51`
`52`	`52`	`#############################################################################`
`53`	`53`
	`54`	`+neutron_ovn_distributed_fip: true`