diff --git a/defaults/main.yml b/defaults/main.yml index 3e5c2f15..31242529 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -443,7 +443,8 @@ neutron_ovn_primary_cluster_node: "{{ groups[neutron_services['neutron-ovn-north neutron_ovn_northd_service_name: ovn-northd neutron_ovn_controller_service_name: ovn-controller neutron_ovn_l3_scheduler: leastloaded -neutron_ovn_ip: "{{ internal_lb_vip_address }}" +neutron_ovn_nb_connection: "tcp:{{ groups['neutron_ovn_northd'] | map('extract', hostvars, ['ansible_host']) | join(':6641,tcp:') }}:6641" +neutron_ovn_sb_connection: "tcp:{{ groups['neutron_ovn_northd'] | map('extract', hostvars, ['ansible_host']) | join(':6642,tcp:') }}:6642" neutron_ovsdb_manager: ptcp:6640:127.0.0.1 ### diff --git a/tasks/providers/setup_ovs_ovn.yml b/tasks/providers/setup_ovs_ovn.yml index 5222f813..21d6e87c 100644 --- a/tasks/providers/setup_ovs_ovn.yml +++ b/tasks/providers/setup_ovs_ovn.yml @@ -27,7 +27,7 @@ - neutron_services['neutron-ovn-controller']['group'] in group_names - name: Configure OVN Southbound Connection - command: "ovs-vsctl set open . external-ids:ovn-remote=tcp:{{ neutron_ovn_ip }}:6642" + command: "ovs-vsctl set open . external-ids:ovn-remote={{ neutron_ovn_sb_connection }}" when: - neutron_services['neutron-ovn-controller']['group'] in group_names diff --git a/templates/plugins/ml2/ml2_conf.ini.j2 b/templates/plugins/ml2/ml2_conf.ini.j2 index dada1670..8495a215 100644 --- a/templates/plugins/ml2/ml2_conf.ini.j2 +++ b/templates/plugins/ml2/ml2_conf.ini.j2 @@ -48,8 +48,8 @@ max_header_size = 38 [ovn] ovn_native_dhcp = True -ovn_nb_connection = tcp:{{ neutron_ovn_ip }}:6641 -ovn_sb_connection = tcp:{{ neutron_ovn_ip }}:6642 +ovn_nb_connection = {{ neutron_ovn_nb_connection }} +ovn_sb_connection = {{ neutron_ovn_sb_connection }} ovn_l3_scheduler = {{ neutron_ovn_l3_scheduler }} ovn_metadata_enabled = True