Merge "Add parameters for manila storage availability zones" into stable/wallaby

deployment/manila/manila-backend-cephfs.yaml

@@ -48,6 +48,12 @@ parameters:
   ManilaCephFSBackendName:
     type: string
     default: cephfs
+  ManilaCephFSAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the CephFS backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaCephFSDriverHandlesShareServers:
     type: boolean
     default: false
@@ -77,7 +83,8 @@ outputs:
     value:
       service_name: manila_backend_cephfs
       config_settings:
-        manila::backend::cephfs::title: {get_param: ManilaCephFSBackendName}
+        map_merge:
+          - manila::backend::cephfs::title: {get_param: ManilaCephFSBackendName}
             manila::backend::cephfs::driver_handles_share_servers: {get_param: ManilaCephFSDriverHandlesShareServers}
             manila::backend::cephfs::pool_name: {get_param: ManilaCephFSDataPoolName}
             manila::backend::cephfs::share_backend_name: {get_param: ManilaCephFSShareBackendName}
@@ -93,3 +100,7 @@ outputs:
             manila::backend::cephfs::cephfs_enable_snapshots: {get_param: ManilaCephFSCephFSEnableSnapshots}
             manila::backend::cephfs::cephfs_volume_mode: {get_param: ManilaCephFSCephVolumeMode}
             manila::backend::cephfs::cephfs_protocol_helper_type: {get_param: ManilaCephFSCephFSProtocolHelperType}
+          - if:
+              - { equals: [ { get_param: ManilaCephFSAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::cephfs::backend_availability_zone: { get_param: ManilaCephFSAvailabilityZone }

deployment/manila/manila-backend-isilon.yaml

@@ -10,6 +10,12 @@ parameters:
   ManilaIsilonBackendName:
     type: string
     default: tripleo_isilon
+  ManilaIsilonAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the Isilon backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaIsilonNasLogin:
     type: string
     default: ''
@@ -59,7 +65,8 @@ outputs:
     value:
       service_name: manila_backend_isilon
       config_settings:
-        manila::backend::dellemc_isilon::title: {get_param: ManilaIsilonBackendName}
+        map_merge:
+          - manila::backend::dellemc_isilon::title: {get_param: ManilaIsilonBackendName}
             manila::backend::dellemc_isilon::emc_nas_login: {get_param: ManilaIsilonNasLogin}
             manila::backend::dellemc_isilon::driver_handles_share_servers: {get_param: ManilaIsilonDriverHandlesShareServers}
             manila::backend::dellemc_isilon::emc_nas_password: {get_param: ManilaIsilonNasPassword}
@@ -67,3 +74,7 @@ outputs:
             manila::backend::dellemc_isilon::emc_nas_root_dir: {get_param: ManilaIsilonNasRootDir}
             manila::backend::dellemc_isilon::emc_nas_server_port: {get_param: ManilaIsilonNasServerPort}
             manila::backend::dellemc_isilon::emc_nas_server_secure: {get_param: ManilaIsilonNasServerSecure}
+          - if:
+              - { equals: [ { get_param: ManilaIsilonAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::dellemc_isilon::backend_availability_zone: { get_param: ManilaIsilonAvailabilityZone }

deployment/manila/manila-backend-netapp.yaml

@@ -10,6 +10,12 @@ parameters:
   ManilaNetappBackendName:
     type: string
     default: tripleo_netapp
+  ManilaNetappAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the NetApp backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaNetappLogin:
     type: string
     default: ''
@@ -95,7 +101,8 @@ outputs:
     value:
       service_name: manila_backend_netapp
       config_settings:
-        manila::backend::netapp::title: {get_param: ManilaNetappBackendName}
+        map_merge:
+          - manila::backend::netapp::title: {get_param: ManilaNetappBackendName}
             manila::backend::netapp::netapp_login: {get_param: ManilaNetappLogin}
             manila::backend::netapp::driver_handles_share_servers: {get_param: ManilaNetappDriverHandlesShareServers}
             manila::backend::netapp::netapp_password: {get_param: ManilaNetappPassword}
@@ -115,3 +122,7 @@ outputs:
             manila::backend::netapp::netapp_enabled_share_protocols: {get_param: ManilaNetappEnabledShareProtocols}
             manila::backend::netapp::netapp_volume_snapshot_reserve_percent: {get_param: ManilaNetappVolumeSnapshotReservePercent}
             manila::backend::netapp::netapp_snapmirror_quiesce_timeout: {get_param: ManilaNetappSnapmirrorQuiesceTimeout}
+          - if:
+              - { equals: [ { get_param: ManilaNetappAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::netapp::backend_availability_zone: { get_param: ManilaNetappAvailabilityZone }

deployment/manila/manila-backend-unity.yaml

@@ -10,6 +10,12 @@ parameters:
   ManilaUnityBackendName:
     type: string
     default: tripleo_manila_unity
+  ManilaUnityAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the Unity backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaUnityNasLogin:
     type: string
     default: ''
@@ -69,7 +75,8 @@ outputs:
     value:
       service_name: manila_backend_unity
       config_settings:
-        manila::backend::dellemc_unity::title: {get_param: ManilaUnityBackendName}
+        map_merge:
+          - manila::backend::dellemc_unity::title: {get_param: ManilaUnityBackendName}
             manila::backend::dellemc_unity::emc_nas_login: {get_param: ManilaUnityNasLogin}
             manila::backend::dellemc_unity::driver_handles_share_servers: {get_param: ManilaUnityDriverHandlesShareServers}
             manila::backend::dellemc_unity::emc_nas_password: {get_param: ManilaUnityNasPassword}
@@ -81,3 +88,7 @@ outputs:
             manila::backend::dellemc_unity::network_plugin_ipv6_enabled: {get_param: ManilaIPv6}
             manila::backend::dellemc_unity::emc_ssl_cert_verify: {get_param: ManilaUnityEmcSslCertVerify}
             manila::backend::dellemc_unity::emc_ssl_cert_path: {get_param: ManilaUnityEmcSslCertPath}
+          - if:
+              - { equals: [ { get_param: ManilaUnityAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::dellemc_unity::backend_availability_zone: { get_param: ManilaUnityAvailabilityZone }

deployment/manila/manila-backend-vmax.yaml

@@ -10,6 +10,12 @@ parameters:
   ManilaVMAXBackendName:
     type: string
     default: tripleo_manila_vmax
+  ManilaVMAXAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the VMAX backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaVMAXNasLogin:
     type: string
     default: ''
@@ -59,7 +65,8 @@ outputs:
     value:
       service_name: manila_backend_vmax
       config_settings:
-        manila::backend::dellemc_vmax::title: {get_param: ManilaVMAXBackendName}
+        map_merge:
+          - manila::backend::dellemc_vmax::title: {get_param: ManilaVMAXBackendName}
             manila::backend::dellemc_vmax::emc_nas_login: {get_param: ManilaVMAXNasLogin}
             manila::backend::dellemc_vmax::driver_handles_share_servers: {get_param: ManilaVMAXDriverHandlesShareServers}
             manila::backend::dellemc_vmax::emc_nas_password: {get_param: ManilaVMAXNasPassword}
@@ -68,3 +75,7 @@ outputs:
             manila::backend::dellemc_vmax::vmax_server_container: {get_param: ManilaVMAXServerContainer}
             manila::backend::dellemc_vmax::vmax_share_data_pools: {get_param: ManilaVMAXShareDataPools}
             manila::backend::dellemc_vmax::vmax_ethernet_ports: {get_param: ManilaVMAXEthernetPorts}
+          - if:
+              - { equals: [ { get_param: ManilaVMAXAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::dellemc_vmax::backend_availability_zone: { get_param: ManilaVMAXAvailabilityZone }

deployment/manila/manila-backend-vnx.yaml

@@ -10,6 +10,12 @@ parameters:
   ManilaVNXBackendName:
     type: string
     default: tripleo_manila_vnx
+  ManilaVNXAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the VNX backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
   ManilaVNXNasLogin:
     type: string
     default: ''
@@ -69,7 +75,8 @@ outputs:
     value:
       service_name: manila_backend_vnx
       config_settings:
-        manila::backend::dellemc_vnx::title: {get_param: ManilaVNXBackendName}
+        map_merge:
+          - manila::backend::dellemc_vnx::title: {get_param: ManilaVNXBackendName}
             manila::backend::dellemc_vnx::emc_nas_login: {get_param: ManilaVNXNasLogin}
             manila::backend::dellemc_vnx::driver_handles_share_servers: {get_param: ManilaVNXDriverHandlesShareServers}
             manila::backend::dellemc_vnx::emc_nas_password: {get_param: ManilaVNXNasPassword}
@@ -81,3 +88,7 @@ outputs:
             manila::backend::dellemc_vnx::network_plugin_ipv6_enabled: {get_param: ManilaIPv6}
             manila::backend::dellemc_vnx::emc_ssl_cert_verify: {get_param: ManilaVNXEmcSslCertVerify}
             manila::backend::dellemc_vnx::emc_ssl_cert_path: {get_param: ManilaVNXEmcSslCertPath}
+          - if:
+              - { equals: [ { get_param: ManilaVNXAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::dellemc_vnx::backend_availability_zone: { get_param: ManilaVNXAvailabilityZone }

deployment/manila/manila-base.yaml

@@ -52,6 +52,10 @@ parameters:
     type: comma_delimited_list
     default: 'noop'
     description: Driver or drivers to handle sending notifications.
+  ManilaStorageAvailabilityZone:
+    default: nova
+    description: The Manila service's storage availability zone.
+    type: string
 
 outputs:
   role_data:
@@ -59,6 +63,7 @@ outputs:
     value:
       service_name: manila_base
       config_settings:
+        manila::storage_availability_zone: {get_param: ManilaStorageAvailabilityZone}
         manila::notification_driver: {get_param: NotificationDriver}
         manila::logging::debug:
           if: