aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-03-29 16:48:23 +0000
committerGerrit Code Review <review@openstack.org>2023-03-29 16:48:23 +0000
commitdbb4f3d0aebd4763f2da5c8a89fdf30b05ad5ba7 (patch)
treefb024c57a97be01d36b369a612ce870accfec803
parent0b7ed4dad918fa327886f9d0b31c35bd097ea42a (diff)
parent6768b760ab77d1642329a86f595ef33b26e6eb42 (diff)
downloadkolla-ansible-dbb4f3d0aebd4763f2da5c8a89fdf30b05ad5ba7.tar.gz
kolla-ansible-dbb4f3d0aebd4763f2da5c8a89fdf30b05ad5ba7.zip
Merge "Add neutron_ovn_availability_zones parameter"
-rw-r--r--ansible/group_vars/all.yml3
-rw-r--r--ansible/roles/ovn-controller/tasks/setup-ovs.yml2
-rw-r--r--releasenotes/notes/neutron_ovn_availability_zones-0271d74dbc4f957e.yaml7
3 files changed, 11 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 8ddb84339..ca573064f 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -1012,6 +1012,9 @@ neutron_sriov_physnet_mappings:
sriovnet1: "{{ tunnel_interface }}"
neutron_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
+# Set OVN network availability zones
+neutron_ovn_availability_zones: []
+
#######################
# Nova options
#######################
diff --git a/ansible/roles/ovn-controller/tasks/setup-ovs.yml b/ansible/roles/ovn-controller/tasks/setup-ovs.yml
index 82f782989..5ac61a16b 100644
--- a/ansible/roles/ovn-controller/tasks/setup-ovs.yml
+++ b/ansible/roles/ovn-controller/tasks/setup-ovs.yml
@@ -14,7 +14,7 @@
vars:
ovn_mappings: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}"
ovn_macs: "{% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ ovn_base_mac | random_mac(seed=inventory_hostname + bridge) }}{% if not loop.last %},{% endif %}{% endfor %}"
- ovn_cms_opts: "{{ 'enable-chassis-as-gw' if inventory_hostname in groups['ovn-controller-network'] else '' }}"
+ ovn_cms_opts: "{{ 'enable-chassis-as-gw' if inventory_hostname in groups['ovn-controller-network'] else '' }}{{ ',availability-zones=' + neutron_ovn_availability_zones | join(',') if inventory_hostname in groups['ovn-controller-network'] and neutron_ovn_availability_zones }}"
become: true
kolla_toolbox:
container_engine: "{{ kolla_container_engine }}"
diff --git a/releasenotes/notes/neutron_ovn_availability_zones-0271d74dbc4f957e.yaml b/releasenotes/notes/neutron_ovn_availability_zones-0271d74dbc4f957e.yaml
new file mode 100644
index 000000000..b03fee554
--- /dev/null
+++ b/releasenotes/notes/neutron_ovn_availability_zones-0271d74dbc4f957e.yaml
@@ -0,0 +1,7 @@
+---
+features:
+ - |
+ With the new ``neutron_ovn_availability_zones`` parameter it is possible
+ to define network availability zones for OVN. Further details can be found
+ in the Neutron OVN documentation:
+ https://docs.openstack.org/neutron/latest/admin/ovn/availability_zones.html#how-to-configure-it