Honor OVNAvailabilityZone while setting ovn_cms_options

OVNAvailabilityZone role_specific parameter was
not being honored while setting ovn_cms_options,
this patch fixes it.

Related-Bug: #1923585
Resolves: rhbz#2232562
Change-Id: I9d89c1659bd00605ccdb9e71c176d7fb24fd2629

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -205,7 +205,10 @@ conditions:
       - not: {equals: [{get_param: [RoleParameters, OVNContainerCpusetCpus]}, '' ]}
   key_size_override_set:
     not: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
-  az_ovn_unset: {equals: [{get_param: OVNAvailabilityZone}, []]}
+  az_ovn_unset:
+    and:
+      - {equals: [{get_param: OVNAvailabilityZone}, []]}
+      - {equals: [{get_param: [RoleParameters, OVNAvailabilityZone]}, '']}
 
 resources:
 
@@ -226,11 +229,7 @@ resources:
                 if:
                   - az_ovn_unset
                   - OVNCMSOptions
-                  - list_join:
-                    - ''
-                    - - OVNCMSOptions
-                      - ",availability-zones="
-                      - {get_param: OVNAvailabilityZone}
+                  - OVNCMSOptionsMerged
               ovn::controller::ovn_encap_tos: OVNEncapTos
               vswitch::ovs::enable_hw_offload: OvsHwOffload
               container_cpuset_cpus: OVNContainerCpusetCpus
@@ -240,6 +239,24 @@ resources:
           - values:
               NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
               OVNCMSOptions: {get_param: OVNCMSOptions}
+              OVNCMSOptionsMerged:
+                  list_join:
+                    - ''
+                    - - str_replace:
+                          template: $OVNCMSOptions
+                          params:
+                            if:
+                              - not: {equals: [{get_param: [RoleParameters, OVNCMSOptions]}, '']}
+                              - $OVNCMSOptions: {get_param: [RoleParameters, OVNCMSOptions]}
+                              - $OVNCMSOptions: {get_param: OVNCMSOptions}
+                      - str_replace:
+                          template: ",availability-zones=$OVNAvailabilityZone"
+                          params:
+                            if:
+                              - not: {equals: [{get_param: [RoleParameters, OVNAvailabilityZone]}, '']}
+                              - $OVNAvailabilityZone: {get_param: [RoleParameters, OVNAvailabilityZone]}
+                              - $OVNAvailabilityZone:
+                                  list_join: [',', {get_param: OVNAvailabilityZone}]
               OVNEncapTos: {get_param: OVNEncapTos}
               OvsHwOffload: {get_param: OvsHwOffload}
               OVNContainerCpusetCpus: {get_param: OVNContainerCpusetCpus}

releasenotes/notes/Fix-OVNAvailabilityZone-Uses-c829b73f88d7b9bb.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Role parameter ``OVNAvailabilityZone`` was not being merged to
+    ``OVNCMSOptions`` while configuring ``ovn_cms_options``, this is
+    now fixed, see https://bugzilla.redhat.com/show_bug.cgi?id=2232562.