Merge "Add parameters for manila storage availability zones"

2021-10-09 13:54:30 +00:00 · 2021-10-09 13:54:30 +00:00 · aa1dc3eb41
parent 7d1615c998 e7f90201bb
commit aa1dc3eb41
8 changed files with 154 additions and 73 deletions
--- a/deployment/manila/manila-backend-cephfs.yaml
+++ b/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
@ -91,18 +97,23 @@ outputs:
    value:
      service_name: manila_backend_cephfs
      config_settings:
-        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}
-        manila_cephfs_ceph_conf_path: {get_param: CephConfigPath}
-        manila::backend::cephfs::cephfs_conf_path:
-          list_join:
-          - ''
-          - - /etc/ceph/
-            - {get_param: CephClusterName}
-            - .conf
-        manila::backend::cephfs::cephfs_auth_id: {get_param: ManilaCephFSCephFSAuthId}
-        manila::backend::cephfs::cephfs_cluster_name: {get_param: CephClusterName}
-        manila::backend::cephfs::cephfs_volume_mode: {get_param: ManilaCephFSCephVolumeMode}
-        manila::backend::cephfs::cephfs_protocol_helper_type: {get_param: ManilaCephFSCephFSProtocolHelperType}
+        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}
+            manila_cephfs_ceph_conf_path: {get_param: CephConfigPath}
+            manila::backend::cephfs::cephfs_conf_path:
+              list_join:
+              - ''
+              - - /etc/ceph/
+                - {get_param: CephClusterName}
+                - .conf
+            manila::backend::cephfs::cephfs_auth_id: {get_param: ManilaCephFSCephFSAuthId}
+            manila::backend::cephfs::cephfs_cluster_name: {get_param: CephClusterName}
+            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 }
--- a/deployment/manila/manila-backend-flashblade-puppet.yaml
+++ b/deployment/manila/manila-backend-flashblade-puppet.yaml
@ -43,6 +43,12 @@ parameters:
  ManilaFlashBladeBackendName:
    type: string
    default: 'tripleo_flashblade'
+  ManilaFlashBladeAvailabilityZone:
+    default: ''
+    description: >
+      The availability zone of the FlashBlade backend.
+      When set, it overrides the default ManilaStorageAvailabilityZone.
+    type: string
  ManilaFlashBladeMgmtIp:
    type: string
  ManilaFlashBladeDataIp:
@ -65,3 +71,7 @@ outputs:
            manila::backend::flashblade::flashblade_data_vip: {get_param: ManilaFlashBladeDataIp}
            manila::backend::flashblade::flashblade_api_token: {get_param: ManilaFlashBladeAPIToken}
            manila::backend::flashblade::flashblade_eradicate : {get_param: ManilaFlashBladeEradicate}
+          - if:
+              - { equals: [ { get_param: ManilaFlashBladeAvailabilityZone }, '' ] }
+              - { }
+              - manila::backend::flashblade::backend_availability_zone: { get_param: ManilaFlashBladeAvailabilityZone }
--- a/deployment/manila/manila-backend-isilon.yaml
+++ b/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: ''
@ -69,10 +75,15 @@ outputs:
    value:
      service_name: manila_backend_isilon
      config_settings:
-        manila::backend::dellemc_isilon::title: {get_param: ManilaIsilonBackendName}
-        manila::backend::dellemc_isilon::emc_nas_login: {get_param: ManilaIsilonNasLogin}
-        manila::backend::dellemc_isilon::emc_nas_password: {get_param: ManilaIsilonNasPassword}
-        manila::backend::dellemc_isilon::emc_nas_server: {get_param: ManilaIsilonNasServer}
-        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}
+        map_merge:
+          - manila::backend::dellemc_isilon::title: {get_param: ManilaIsilonBackendName}
+            manila::backend::dellemc_isilon::emc_nas_login: {get_param: ManilaIsilonNasLogin}
+            manila::backend::dellemc_isilon::emc_nas_password: {get_param: ManilaIsilonNasPassword}
+            manila::backend::dellemc_isilon::emc_nas_server: {get_param: ManilaIsilonNasServer}
+            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 }
--- a/deployment/manila/manila-backend-netapp.yaml
+++ b/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,23 +101,28 @@ outputs:
    value:
      service_name: manila_backend_netapp
      config_settings:
-        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}
-        manila::backend::netapp::netapp_server_hostname: {get_param: ManilaNetappServerHostname}
-        manila::backend::netapp::netapp_transport_type: {get_param: ManilaNetappTransportType}
-        manila::backend::netapp::netapp_storage_family: {get_param: ManilaNetappStorageFamily}
-        manila::backend::netapp::netapp_server_port: {get_param: ManilaNetappServerPort}
-        manila::backend::netapp::netapp_volume_name_template: {get_param: ManilaNetappVolumeNameTemplate}
-        manila::backend::netapp::netapp_vserver: {get_param: ManilaNetappVserver}
-        manila::backend::netapp::netapp_vserver_name_template: {get_param: ManilaNetappVserverNameTemplate}
-        manila::backend::netapp::netapp_lif_name_template: {get_param: ManilaNetappLifNameTemplate}
-        manila::backend::netapp::netapp_aggregate_name_search_pattern: {get_param: ManilaNetappAggrNameSearchPattern}
-        manila::backend::netapp::netapp_root_volume_aggregate: {get_param: ManilaNetappRootVolumeAggr}
-        manila::backend::netapp::netapp_root_volume: {get_param: ManilaNetappRootVolume}
-        manila::backend::netapp::netapp_port_name_search_pattern: {get_param: ManilaNetappPortNameSearchPattern}
-        manila::backend::netapp::netapp_trace_flags: {get_param: ManilaNetappTraceFlags}
-        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}
+        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}
+            manila::backend::netapp::netapp_server_hostname: {get_param: ManilaNetappServerHostname}
+            manila::backend::netapp::netapp_transport_type: {get_param: ManilaNetappTransportType}
+            manila::backend::netapp::netapp_storage_family: {get_param: ManilaNetappStorageFamily}
+            manila::backend::netapp::netapp_server_port: {get_param: ManilaNetappServerPort}
+            manila::backend::netapp::netapp_volume_name_template: {get_param: ManilaNetappVolumeNameTemplate}
+            manila::backend::netapp::netapp_vserver: {get_param: ManilaNetappVserver}
+            manila::backend::netapp::netapp_vserver_name_template: {get_param: ManilaNetappVserverNameTemplate}
+            manila::backend::netapp::netapp_lif_name_template: {get_param: ManilaNetappLifNameTemplate}
+            manila::backend::netapp::netapp_aggregate_name_search_pattern: {get_param: ManilaNetappAggrNameSearchPattern}
+            manila::backend::netapp::netapp_root_volume_aggregate: {get_param: ManilaNetappRootVolumeAggr}
+            manila::backend::netapp::netapp_root_volume: {get_param: ManilaNetappRootVolume}
+            manila::backend::netapp::netapp_port_name_search_pattern: {get_param: ManilaNetappPortNameSearchPattern}
+            manila::backend::netapp::netapp_trace_flags: {get_param: ManilaNetappTraceFlags}
+            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 }
--- a/deployment/manila/manila-backend-unity.yaml
+++ b/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,15 +75,20 @@ outputs:
    value:
      service_name: manila_backend_unity
      config_settings:
-        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}
-        manila::backend::dellemc_unity::emc_nas_server: {get_param: ManilaUnityNasServer}
-        manila::backend::dellemc_unity::emc_share_backend: unity
-        manila::backend::dellemc_unity::unity_server_meta_pool: {get_param: ManilaUnityServerMetaPool}
-        manila::backend::dellemc_unity::unity_share_data_pools: {get_param: ManilaUnityShareDataPools}
-        manila::backend::dellemc_unity::unity_ethernet_ports: {get_param: ManilaUnityEthernetPorts}
-        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}
+        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}
+            manila::backend::dellemc_unity::emc_nas_server: {get_param: ManilaUnityNasServer}
+            manila::backend::dellemc_unity::emc_share_backend: unity
+            manila::backend::dellemc_unity::unity_server_meta_pool: {get_param: ManilaUnityServerMetaPool}
+            manila::backend::dellemc_unity::unity_share_data_pools: {get_param: ManilaUnityShareDataPools}
+            manila::backend::dellemc_unity::unity_ethernet_ports: {get_param: ManilaUnityEthernetPorts}
+            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 }
--- a/deployment/manila/manila-backend-vmax.yaml
+++ b/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: ''
@ -69,11 +75,16 @@ outputs:
    value:
      service_name: manila_backend_vmax
      config_settings:
-        manila::backend::dellemc_vmax::title: {get_param: ManilaVMAXBackendName}
-        manila::backend::dellemc_vmax::emc_nas_login: {get_param: ManilaVMAXNasLogin}
-        manila::backend::dellemc_vmax::emc_nas_password: {get_param: ManilaVMAXNasPassword}
-        manila::backend::dellemc_vmax::emc_nas_server: {get_param: ManilaVMAXNasServer}
-        manila::backend::dellemc_vmax::emc_share_backend: vmax
-        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}
+        map_merge:
+          - manila::backend::dellemc_vmax::title: {get_param: ManilaVMAXBackendName}
+            manila::backend::dellemc_vmax::emc_nas_login: {get_param: ManilaVMAXNasLogin}
+            manila::backend::dellemc_vmax::emc_nas_password: {get_param: ManilaVMAXNasPassword}
+            manila::backend::dellemc_vmax::emc_nas_server: {get_param: ManilaVMAXNasServer}
+            manila::backend::dellemc_vmax::emc_share_backend: vmax
+            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 }
--- a/deployment/manila/manila-backend-vnx.yaml
+++ b/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: ''
@ -79,14 +85,19 @@ outputs:
    value:
      service_name: manila_backend_vnx
      config_settings:
-        manila::backend::dellemc_vnx::title: {get_param: ManilaVNXBackendName}
-        manila::backend::dellemc_vnx::emc_nas_login: {get_param: ManilaVNXNasLogin}
-        manila::backend::dellemc_vnx::emc_nas_password: {get_param: ManilaVNXNasPassword}
-        manila::backend::dellemc_vnx::emc_nas_server: {get_param: ManilaVNXNasServer}
-        manila::backend::dellemc_vnx::emc_share_backend: vnx
-        manila::backend::dellemc_vnx::vnx_server_container: {get_param: ManilaVNXServerContainer}
-        manila::backend::dellemc_vnx::vnx_share_data_pools: {get_param: ManilaVNXShareDataPools}
-        manila::backend::dellemc_vnx::vnx_ethernet_ports: {get_param: ManilaVNXEthernetPorts}
-        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}
+        map_merge:
+          - manila::backend::dellemc_vnx::title: {get_param: ManilaVNXBackendName}
+            manila::backend::dellemc_vnx::emc_nas_login: {get_param: ManilaVNXNasLogin}
+            manila::backend::dellemc_vnx::emc_nas_password: {get_param: ManilaVNXNasPassword}
+            manila::backend::dellemc_vnx::emc_nas_server: {get_param: ManilaVNXNasServer}
+            manila::backend::dellemc_vnx::emc_share_backend: vnx
+            manila::backend::dellemc_vnx::vnx_server_container: {get_param: ManilaVNXServerContainer}
+            manila::backend::dellemc_vnx::vnx_share_data_pools: {get_param: ManilaVNXShareDataPools}
+            manila::backend::dellemc_vnx::vnx_ethernet_ports: {get_param: ManilaVNXEthernetPorts}
+            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 }
--- a/deployment/manila/manila-base.yaml
+++ b/deployment/manila/manila-base.yaml
@ -56,6 +56,10 @@ parameters:
    default: 60
    description: Manila's RPC response timeout, in seconds.
    type: number
+  ManilaStorageAvailabilityZone:
+    default: nova
+    description: The Manila service's storage availability zone.
+    type: string

 outputs:
  role_data:
@ -63,6 +67,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: