diff --git a/manifests/backend/cephfs.pp b/manifests/backend/cephfs.pp
index 96394607..0ffdc388 100644
--- a/manifests/backend/cephfs.pp
+++ b/manifests/backend/cephfs.pp
@@ -13,6 +13,12 @@
 #  these settings will reside in
 #  Defaults to: $name
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*cephfs_conf_path*]
 #   (optional) Path to cephfs config.
 #   Defaults to: $state_path/ceph.conf
@@ -65,6 +71,7 @@
 define manila::backend::cephfs (
   $driver_handles_share_servers       = false,
   $share_backend_name                 = $name,
+  $backend_availability_zone          = $::os_service_default,
   $cephfs_conf_path                   = '$state_path/ceph.conf',
   $cephfs_auth_id                     = 'manila',
   $cephfs_cluster_name                = 'ceph',
@@ -85,6 +92,7 @@ define manila::backend::cephfs (
   manila_config {
     "${name}/driver_handles_share_servers":       value => $driver_handles_share_servers;
     "${name}/share_backend_name":                 value => $share_backend_name;
+    "${name}/backend_availability_zone":          value => $backend_availability_zone;
     "${name}/share_driver":                       value => $share_driver;
     "${name}/cephfs_conf_path":                   value => $cephfs_conf_path;
     "${name}/cephfs_auth_id":                     value => $cephfs_auth_id;
diff --git a/manifests/backend/dellemc_isilon.pp b/manifests/backend/dellemc_isilon.pp
index c7c66d22..3b44c7fa 100644
--- a/manifests/backend/dellemc_isilon.pp
+++ b/manifests/backend/dellemc_isilon.pp
@@ -24,6 +24,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*emc_nas_root_dir*]
 #   (optional) The root directory where shares will be located.
 #   Defaults to $::os_service_default
@@ -61,6 +67,7 @@ define manila::backend::dellemc_isilon (
   $emc_nas_server,
   $emc_share_backend,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $emc_nas_root_dir             = $::os_service_default,
   $emc_nas_server_port          = 8080,
   $emc_nas_server_secure        = true,
@@ -87,6 +94,7 @@ define manila::backend::dellemc_isilon (
     "${share_backend_name}/emc_nas_password":             value => $emc_nas_password, secret => true;
     "${share_backend_name}/emc_nas_server":               value => $emc_nas_server;
     "${share_backend_name}/share_backend_name":           value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":    value => $backend_availability_zone;
     "${share_backend_name}/emc_share_backend":            value => $emc_share_backend;
     "${share_backend_name}/emc_nas_root_dir":             value => $emc_nas_root_dir;
     "${share_backend_name}/emc_nas_server_port":          value => $emc_nas_server_port;
diff --git a/manifests/backend/dellemc_unity.pp b/manifests/backend/dellemc_unity.pp
index 7a0425c0..79d0eec8 100644
--- a/manifests/backend/dellemc_unity.pp
+++ b/manifests/backend/dellemc_unity.pp
@@ -29,6 +29,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*unity_server_meta_pool*]
 #   (optional) The name of the pool to persist the meta-data of NAS server.
 #   Defaults to None
@@ -83,6 +89,7 @@ define manila::backend::dellemc_unity (
   $emc_nas_server,
   $emc_share_backend,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $unity_server_meta_pool       = undef,
   $unity_share_data_pools       = undef,
   $unity_ethernet_ports         = undef,
@@ -106,6 +113,7 @@ define manila::backend::dellemc_unity (
     "${share_backend_name}/emc_nas_password":             value => $emc_nas_password, secret => true;
     "${share_backend_name}/emc_nas_server":               value => $emc_nas_server;
     "${share_backend_name}/share_backend_name":           value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":    value => $backend_availability_zone;
     "${share_backend_name}/emc_share_backend":            value => $emc_share_backend;
     "${share_backend_name}/unity_server_meta_pool":       value => $unity_server_meta_pool;
     "${share_backend_name}/unity_share_data_pools":       value => $unity_share_data_pools;
diff --git a/manifests/backend/dellemc_vmax.pp b/manifests/backend/dellemc_vmax.pp
index fdd56942..2ec3d6eb 100644
--- a/manifests/backend/dellemc_vmax.pp
+++ b/manifests/backend/dellemc_vmax.pp
@@ -23,6 +23,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*vmax_server_container*]
 #   (optional) Name of the Data Mover to serve the share service.
 #   Defaults to $::os_service_default
@@ -65,6 +71,7 @@ define manila::backend::dellemc_vmax (
   $emc_nas_server,
   $emc_share_backend,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $vmax_server_container        = $::os_service_default,
   $vmax_share_data_pools        = $::os_service_default,
   $vmax_ethernet_ports          = $::os_service_default,
@@ -90,6 +97,7 @@ define manila::backend::dellemc_vmax (
     "${share_backend_name}/emc_nas_password":             value => $emc_nas_password, secret => true;
     "${share_backend_name}/emc_nas_server":               value => $emc_nas_server;
     "${share_backend_name}/share_backend_name":           value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":    value => $backend_availability_zone;
     "${share_backend_name}/emc_share_backend":            value => $emc_share_backend;
     "${share_backend_name}/vmax_server_container":        value => $vmax_server_container;
     "${share_backend_name}/vmax_share_data_pools":        value => $vmax_share_data_pools;
diff --git a/manifests/backend/dellemc_vnx.pp b/manifests/backend/dellemc_vnx.pp
index a7afe1b3..7297134b 100644
--- a/manifests/backend/dellemc_vnx.pp
+++ b/manifests/backend/dellemc_vnx.pp
@@ -23,6 +23,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*vnx_server_container*]
 #   (optional) Name of the Data Mover to serve the share service.
 #   Defaults to $::os_service_default
@@ -83,6 +89,7 @@ define manila::backend::dellemc_vnx (
   $emc_nas_server,
   $emc_share_backend,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $vnx_server_container         = $::os_service_default,
   $vnx_share_data_pools         = $::os_service_default,
   $vnx_ethernet_ports           = $::os_service_default,
@@ -111,6 +118,7 @@ define manila::backend::dellemc_vnx (
     "${share_backend_name}/emc_nas_password":             value => $emc_nas_password, secret => true;
     "${share_backend_name}/emc_nas_server":               value => $emc_nas_server;
     "${share_backend_name}/share_backend_name":           value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":    value => $backend_availability_zone;
     "${share_backend_name}/emc_share_backend":            value => $emc_share_backend;
     "${share_backend_name}/vnx_server_container":         value => $vnx_server_container;
     "${share_backend_name}/vnx_share_data_pools":         value => $vnx_share_data_pools;
diff --git a/manifests/backend/flashblade.pp b/manifests/backend/flashblade.pp
index b4bf011a..9d6af499 100644
--- a/manifests/backend/flashblade.pp
+++ b/manifests/backend/flashblade.pp
@@ -18,6 +18,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*flashblade_eradicate*]
 #   (optional) Fully eradicate deleted shares and snapshots.
 #   Defaults to True
@@ -37,9 +43,10 @@ define manila::backend::flashblade (
   $flashblade_api,
   $flashblade_data_vip,
   $flashblade_mgmt_vip,
-  $flashblade_eradicate = true,
-  $share_backend_name   = $name,
-  $package_ensure       = 'present',
+  $flashblade_eradicate      = true,
+  $share_backend_name        = $name,
+  $backend_availability_zone = $::os_service_default,
+  $package_ensure            = 'present',
 ) {
 
   include manila::deps
@@ -57,6 +64,7 @@ define manila::backend::flashblade (
     "${share_backend_name}/flashblade_mgmt_vip":          value => $flashblade_mgmt_vip;
     "${share_backend_name}/flashblade_data_vip":          value => $flashblade_data_vip;
     "${share_backend_name}/share_backend_name":           value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":    value => $backend_availability_zone;
   }
 
   ensure_packages('nfs-client', {
diff --git a/manifests/backend/generic.pp b/manifests/backend/generic.pp
index 4d8f02a6..5483659e 100644
--- a/manifests/backend/generic.pp
+++ b/manifests/backend/generic.pp
@@ -11,6 +11,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*smb_template_config_path*]
 #   (optional) Path to smb config.
 #   Defaults to: $state_path/smb.conf
@@ -72,6 +78,7 @@
 define manila::backend::generic (
   $driver_handles_share_servers,
   $share_backend_name                  = $name,
+  $backend_availability_zone           = $::os_service_default,
   $smb_template_config_path            = '$state_path/smb.conf',
   $volume_name_template                = 'manila-share-%s',
   $volume_snapshot_name_template       = 'manila-snapshot-%s',
@@ -95,6 +102,7 @@ define manila::backend::generic (
   manila_config {
     "${name}/driver_handles_share_servers":        value => $driver_handles_share_servers;
     "${name}/share_backend_name":                  value => $share_backend_name;
+    "${name}/backend_availability_zone":           value => $backend_availability_zone;
     "${name}/share_driver":                        value => $share_driver;
     "${name}/smb_template_config_path":            value => $smb_template_config_path;
     "${name}/volume_name_template":                value => $volume_name_template;
diff --git a/manifests/backend/glusterfs.pp b/manifests/backend/glusterfs.pp
index 1ca722fa..d341dcf5 100644
--- a/manifests/backend/glusterfs.pp
+++ b/manifests/backend/glusterfs.pp
@@ -8,6 +8,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*glusterfs_volumes_config*]
 #   (required) File with the list of Gluster volumes that can be used to
 #   create shares
@@ -24,6 +30,7 @@
 #
 define manila::backend::glusterfs (
   $share_backend_name         = $name,
+  $backend_availability_zone  = $::os_service_default,
   $glusterfs_volumes_config   = '/etc/manila/glusterfs_volumes',
   $glusterfs_mount_point_base = '$state_path/mnt',
 ) {
@@ -33,6 +40,7 @@ define manila::backend::glusterfs (
 
   manila_config {
     "${name}/share_backend_name":          value => $share_backend_name;
+    "${name}/backend_availability_zone":   value => $backend_availability_zone;
     "${name}/share_driver":                value => $share_driver;
     "${name}/glusterfs_volumes_config":    value => $glusterfs_volumes_config;
     "${name}/glusterfs_mount_point_base":  value => $glusterfs_mount_point_base;
diff --git a/manifests/backend/glusternative.pp b/manifests/backend/glusternative.pp
index aeaacfab..764dadf3 100644
--- a/manifests/backend/glusternative.pp
+++ b/manifests/backend/glusternative.pp
@@ -8,6 +8,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*glusterfs_servers*]
 #   (required) List of GlusterFS servers that can be used to create shares.
 #   Each GlusterFS server should be of the form [remoteuser@]<volserver>, and
@@ -34,6 +40,7 @@ define manila::backend::glusternative (
   $glusterfs_servers,
   $glusterfs_volume_pattern,
   $share_backend_name                   = $name,
+  $backend_availability_zone            = $::os_service_default,
   $package_ensure                       = 'present',
   $glusterfs_path_to_private_key        = undef,
   # DEPRECATED PARAMETERS
@@ -53,6 +60,7 @@ define manila::backend::glusternative (
 
   manila_config {
     "${share_backend_name}/share_backend_name":            value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":     value => $backend_availability_zone;
     "${share_backend_name}/share_driver":                  value => $share_driver;
     "${share_backend_name}/glusterfs_servers":             value => $glusterfs_servers;
     "${share_backend_name}/glusterfs_path_to_private_key": value => $glusterfs_path_to_private_key_real;
diff --git a/manifests/backend/glusternfs.pp b/manifests/backend/glusternfs.pp
index 7ab3897e..ca8da3d1 100644
--- a/manifests/backend/glusternfs.pp
+++ b/manifests/backend/glusternfs.pp
@@ -28,6 +28,12 @@
 # [*share_backend_name*]
 #   (optional) Backend name in manila.conf where these settings will reside in.
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*package_ensure*]
 #   (optional) Ensure state for package. Defaults to 'present'.
 #
@@ -38,8 +44,9 @@ define manila::backend::glusternfs (
   $glusterfs_nfs_server_type,
   $glusterfs_path_to_private_key,
   $glusterfs_ganesha_server_ip,
-  $share_backend_name = $name,
-  $package_ensure     = 'present',
+  $share_backend_name        = $name,
+  $backend_availability_zone = $::os_service_default,
+  $package_ensure            = 'present',
 ) {
 
   include manila::deps
@@ -49,6 +56,7 @@ define manila::backend::glusternfs (
 
   manila_config {
     "${share_backend_name}/share_backend_name":            value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":     value => $backend_availability_zone;
     "${share_backend_name}/share_driver":                  value => $share_driver;
     "${share_backend_name}/glusterfs_target":              value => $glusterfs_target;
     "${share_backend_name}/glusterfs_mount_point_base":    value => $glusterfs_mount_point_base;
diff --git a/manifests/backend/hitachi_hnas.pp b/manifests/backend/hitachi_hnas.pp
index 1d689628..f88fdc28 100644
--- a/manifests/backend/hitachi_hnas.pp
+++ b/manifests/backend/hitachi_hnas.pp
@@ -34,6 +34,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*package_ensure*]
 #   (optional) Ensure state for package. Defaults to 'present'.
 #
@@ -58,6 +64,7 @@ define manila::backend::hitachi_hnas (
   $hitachi_hnas_file_system_name,
   $driver_handles_share_servers = false,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $package_ensure               = 'present',
 ) {
 
@@ -71,6 +78,7 @@ define manila::backend::hitachi_hnas (
   manila_config {
     "${share_backend_name}/share_driver":                     value => $hitachi_share_driver;
     "${share_backend_name}/driver_handles_share_servers":     value => $driver_handles_share_servers;
+    "${share_backend_name}/backend_availability_zone":        value => $backend_availability_zone;
     "${share_backend_name}/hitachi_hnas_username":            value => $hitachi_hnas_username;
     "${share_backend_name}/hitachi_hnas_password":            value => $hitachi_hnas_password, secret => true;
     "${share_backend_name}/hitachi_hnas_ip":                  value => $hitachi_hnas_ip;
diff --git a/manifests/backend/lvm.pp b/manifests/backend/lvm.pp
index 48bb437c..acf27d31 100644
--- a/manifests/backend/lvm.pp
+++ b/manifests/backend/lvm.pp
@@ -12,6 +12,12 @@
 #   reside in.
 #   Defaults to: $name
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*driver_handles_share_servers*]
 #  (optional) Denotes whether the driver should handle the responsibility of
 #  managing share servers. This must be set to false if the driver is to
@@ -38,6 +44,7 @@
 define manila::backend::lvm (
   $lvm_share_export_ips,
   $share_backend_name           = $name,
+  $backend_availability_zone    = $::os_service_default,
   $driver_handles_share_servers = $::os_service_default,
   $lvm_share_export_root        = $::os_service_default,
   $lvm_share_mirrors            = $::os_service_default,
@@ -50,6 +57,7 @@ define manila::backend::lvm (
 
   manila_config {
     "${name}/share_backend_name":           value => $share_backend_name;
+    "${name}/backend_availability_zone":    value => $backend_availability_zone;
     "${name}/share_driver":                 value => $share_driver;
     "${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
     "${name}/lvm_share_export_ips":         value => join(any2array($lvm_share_export_ips),',');
diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp
index d6ba140c..505e2b55 100644
--- a/manifests/backend/netapp.pp
+++ b/manifests/backend/netapp.pp
@@ -25,6 +25,12 @@
 #   (optional) Name of the backend in manila.conf that
 #   these settings will reside in
 #
+# [*backend_availability_zone*]
+#   (Optional) Availability zone for this share backend.
+#   If not set, the storage_availability_zone option value
+#   is used as the default for all backends.
+#   Defaults to $::os_service_default.
+#
 # [*netapp_transport_type*]
 #   (optional) The transport protocol used when communicating with
 #   the storage system or proxy server. Valid values are
@@ -113,6 +119,7 @@ define manila::backend::netapp (
   $netapp_password,
   $netapp_server_hostname,
   $share_backend_name                   = $name,
+  $backend_availability_zone            = $::os_service_default,
   $netapp_transport_type                = 'http',
   $netapp_storage_family                = 'ontap_cluster',
   $netapp_server_port                   = undef,
@@ -150,6 +157,7 @@ define manila::backend::netapp (
     "${share_backend_name}/netapp_password":                      value => $netapp_password, secret => true;
     "${share_backend_name}/netapp_server_hostname":               value => $netapp_server_hostname;
     "${share_backend_name}/share_backend_name":                   value => $share_backend_name;
+    "${share_backend_name}/backend_availability_zone":            value => $backend_availability_zone;
     "${share_backend_name}/netapp_transport_type":                value => $netapp_transport_type;
     "${share_backend_name}/netapp_storage_family":                value => $netapp_storage_family;
     "${share_backend_name}/netapp_server_port":                   value => $netapp_server_port;
diff --git a/releasenotes/notes/add-share-backend-availability-zone-parameters-1bcf6b1066dc82cf.yaml b/releasenotes/notes/add-share-backend-availability-zone-parameters-1bcf6b1066dc82cf.yaml
new file mode 100644
index 00000000..3209d8d2
--- /dev/null
+++ b/releasenotes/notes/add-share-backend-availability-zone-parameters-1bcf6b1066dc82cf.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add new "backend_availability_zone" parameter to every share
+    backend. The parameters are optional, and when set they override the
+    DEFAULT/storage_availability_zone for the corresponding backend.
diff --git a/spec/defines/manila_backend_cephfs_spec.rb b/spec/defines/manila_backend_cephfs_spec.rb
index ee3e406b..9d187c9d 100644
--- a/spec/defines/manila_backend_cephfs_spec.rb
+++ b/spec/defines/manila_backend_cephfs_spec.rb
@@ -8,6 +8,7 @@ describe 'manila::backend::cephfs' do
       {
         :driver_handles_share_servers       => false,
         :share_backend_name                 => 'cephfs',
+        :backend_availability_zone          => 'my_zone',
         :cephfs_conf_path                   => '$state_path/ceph.conf',
         :cephfs_auth_id                     => 'manila',
         :cephfs_cluster_name                => 'ceph',
@@ -26,6 +27,8 @@ describe 'manila::backend::cephfs' do
         'manila.share.drivers.cephfs.driver.CephFSDriver')
       is_expected.to contain_manila_config('cephfs/share_backend_name').with_value(
         'cephfs')
+      is_expected.to contain_manila_config('cephfs/backend_availability_zone').with_value(
+        'my_zone')
       is_expected.to contain_manila_config('cephfs/cephfs_conf_path').with_value(
         '$state_path/ceph.conf')
       is_expected.to contain_manila_config('cephfs/cephfs_auth_id').with_value(
diff --git a/spec/defines/manila_backend_dellemc_isilon_spec.rb b/spec/defines/manila_backend_dellemc_isilon_spec.rb
index 977f2351..ed4b9f51 100644
--- a/spec/defines/manila_backend_dellemc_isilon_spec.rb
+++ b/spec/defines/manila_backend_dellemc_isilon_spec.rb
@@ -15,9 +15,10 @@ describe 'manila::backend::dellemc_isilon' do
 
   let :default_params do
     {
-      :emc_nas_root_dir      => '<SERVICE DEFAULT>',
-      :emc_nas_server_port   => 8080,
-      :emc_nas_server_secure => true,
+      :backend_availability_zone => '<SERVICE DEFAULT>',
+      :emc_nas_root_dir          => '<SERVICE DEFAULT>',
+      :emc_nas_server_port       => 8080,
+      :emc_nas_server_secure     => true,
     }
   end
 
@@ -52,9 +53,10 @@ describe 'manila::backend::dellemc_isilon' do
     context 'with provided parameters' do
       let :params do
         required_params.merge!({
-          :emc_nas_root_dir      => 'myroot',
-          :emc_nas_server_port   => 8000,
-          :emc_nas_server_secure => false,
+          :emc_nas_root_dir          => 'myroot',
+          :emc_nas_server_port       => 8000,
+          :emc_nas_server_secure     => false,
+          :backend_availability_zone => 'my_zone',
         })
       end
 
diff --git a/spec/defines/manila_backend_dellemc_unity_spec.rb b/spec/defines/manila_backend_dellemc_unity_spec.rb
index 05948465..9fc6a087 100644
--- a/spec/defines/manila_backend_dellemc_unity_spec.rb
+++ b/spec/defines/manila_backend_dellemc_unity_spec.rb
@@ -17,6 +17,7 @@ describe 'manila::backend::dellemc_unity' do
       :network_plugin_ipv6_enabled          => true,
       :emc_ssl_cert_verify                  => true,
       :emc_ssl_cert_path                    => '/etc/ssl/certs/',
+      :backend_availability_zone            => 'my_zone',
     }
   end
 
@@ -28,6 +29,7 @@ describe 'manila::backend::dellemc_unity' do
       :network_plugin_ipv6_enabled  => '<SERVICE DEFAULT>',
       :emc_ssl_cert_verify          => '<SERVICE DEFAULT>',
       :emc_ssl_cert_path            => '<SERVICE DEFAULT>',
+      :backend_availability_zone    => '<SERVICE DEFAULT>',
     }
   end
 
diff --git a/spec/defines/manila_backend_dellemc_vmax_spec.rb b/spec/defines/manila_backend_dellemc_vmax_spec.rb
index f6ea09b6..2c0c495e 100644
--- a/spec/defines/manila_backend_dellemc_vmax_spec.rb
+++ b/spec/defines/manila_backend_dellemc_vmax_spec.rb
@@ -15,9 +15,10 @@ describe 'manila::backend::dellemc_vmax' do
 
   let :default_params do
     {
-      :vmax_server_container  => '<SERVICE DEFAULT>',
-      :vmax_share_data_pools  => '<SERVICE DEFAULT>',
-      :vmax_ethernet_ports    => '<SERVICE DEFAULT>',
+      :vmax_server_container     => '<SERVICE DEFAULT>',
+      :vmax_share_data_pools     => '<SERVICE DEFAULT>',
+      :vmax_ethernet_ports       => '<SERVICE DEFAULT>',
+      :backend_availability_zone => '<SERVICE DEFAULT>',
     }
   end
 
@@ -52,9 +53,10 @@ describe 'manila::backend::dellemc_vmax' do
     context 'with provided parameters' do
       let :params do
         required_params.merge!({
-          :vmax_server_container => 'container1',
-          :vmax_share_data_pools => '*',
-          :vmax_ethernet_ports   => 'eth1',
+          :vmax_server_container     => 'container1',
+          :vmax_share_data_pools     => '*',
+          :vmax_ethernet_ports       => 'eth1',
+          :backend_availability_zone => 'my_zone',
         })
       end
 
diff --git a/spec/defines/manila_backend_dellemc_vnx_spec.rb b/spec/defines/manila_backend_dellemc_vnx_spec.rb
index cdd8aa12..330c600d 100644
--- a/spec/defines/manila_backend_dellemc_vnx_spec.rb
+++ b/spec/defines/manila_backend_dellemc_vnx_spec.rb
@@ -21,6 +21,7 @@ describe 'manila::backend::dellemc_vnx' do
       :network_plugin_ipv6_enabled  => true,
       :emc_ssl_cert_verify          => false,
       :emc_ssl_cert_path            => '<SERVICE DEFAULT>',
+      :backend_availability_zone    => '<SERVICE DEFAULT>',
     }
   end
 
@@ -61,6 +62,7 @@ describe 'manila::backend::dellemc_vnx' do
           :network_plugin_ipv6_enabled => true,
           :emc_ssl_cert_verify         => true,
           :emc_ssl_cert_path           => '/etc/ssl/certs/',
+          :backend_availability_zone   => 'my_zone',
         })
       end
 
diff --git a/spec/defines/manila_backend_flashblade_spec.rb b/spec/defines/manila_backend_flashblade_spec.rb
index fa0d13b3..3bc1d9f4 100644
--- a/spec/defines/manila_backend_flashblade_spec.rb
+++ b/spec/defines/manila_backend_flashblade_spec.rb
@@ -6,7 +6,7 @@ describe 'manila::backend::flashblade' do
 
   let :required_params do
     {
-      :flashblade_api => 'admin',
+      :flashblade_api      => 'admin',
       :flashblade_mgmt_vip => '10.1.1.1',
       :flashblade_data_vip => '10.1.1.2',
     }
@@ -14,7 +14,8 @@ describe 'manila::backend::flashblade' do
 
   let :default_params do
     {
-     :flashblade_eradicate => true,
+     :flashblade_eradicate      => true,
+     :backend_availability_zone => '<SERVICE DEFAULT>',
     }
   end
 
@@ -49,7 +50,8 @@ describe 'manila::backend::flashblade' do
     context 'with share server config' do
       let :params do
         required_params.merge!({
-          :flashblade_eradicate => true,
+          :flashblade_eradicate      => true,
+          :backend_availability_zone => 'my_zone',
         })
       end
 
diff --git a/spec/defines/manila_backend_generic_spec.rb b/spec/defines/manila_backend_generic_spec.rb
index 02068b54..1e00eabf 100644
--- a/spec/defines/manila_backend_generic_spec.rb
+++ b/spec/defines/manila_backend_generic_spec.rb
@@ -16,10 +16,12 @@ describe 'manila::backend::generic' do
       :service_instance_smb_config_path => '$share_mount_path/smb.conf',
       :share_volume_fstype              => 'ext4',
       :cinder_volume_type               => 'gold',
+      :backend_availability_zone        => 'my_zone',
     }
   end
 
   shared_examples 'manila::backend::generic' do
+
     context 'generic share driver' do
       it 'configures generic share driver' do
         is_expected.to contain_manila_config('hippo/share_backend_name').with(
diff --git a/spec/defines/manila_backend_glusterfs_spec.rb b/spec/defines/manila_backend_glusterfs_spec.rb
index 0c09f457..f5aa24ee 100644
--- a/spec/defines/manila_backend_glusterfs_spec.rb
+++ b/spec/defines/manila_backend_glusterfs_spec.rb
@@ -9,6 +9,7 @@ describe 'manila::backend::glusterfs' do
       {
         :glusterfs_volumes_config    => '/etc/manila/glusterfs_volumes',
         :glusterfs_mount_point_base  => '$state_path/mnt',
+        :backend_availability_zone   => 'my_zone',
       }
     end
 
@@ -21,6 +22,8 @@ describe 'manila::backend::glusterfs' do
         '/etc/manila/glusterfs_volumes')
       is_expected.to contain_manila_config('mygluster/glusterfs_mount_point_base').with_value(
         '$state_path/mnt')
+      is_expected.to contain_manila_config('mygluster/backend_availability_zone').with_value(
+        'my_zone')
     end
   end
 
diff --git a/spec/defines/manila_backend_glusternative_spec.rb b/spec/defines/manila_backend_glusternative_spec.rb
index ac3bd109..175f2a70 100644
--- a/spec/defines/manila_backend_glusternative_spec.rb
+++ b/spec/defines/manila_backend_glusternative_spec.rb
@@ -10,6 +10,7 @@ describe 'manila::backend::glusternative' do
         :glusterfs_servers                    => 'remoteuser@volserver',
         :glusterfs_path_to_private_key        => '/etc/glusterfs/glusterfs.pem',
         :glusterfs_volume_pattern             => 'manila-share-volume-\d+$',
+        :backend_availability_zone            => 'my_zone',
       }
     end
 
diff --git a/spec/defines/manila_backend_glusternfs_spec.rb b/spec/defines/manila_backend_glusternfs_spec.rb
index 674ddc8c..4bfe3011 100644
--- a/spec/defines/manila_backend_glusternfs_spec.rb
+++ b/spec/defines/manila_backend_glusternfs_spec.rb
@@ -12,6 +12,7 @@ describe 'manila::backend::glusternfs' do
         :glusterfs_nfs_server_type     => 'gluster',
         :glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
         :glusterfs_ganesha_server_ip   => '127.0.0.1',
+        :backend_availability_zone     => 'my_zone',
       }
     end
 
diff --git a/spec/defines/manila_backend_hitachi_hnas_spec.rb b/spec/defines/manila_backend_hitachi_hnas_spec.rb
index f468ec5f..926ba9c1 100644
--- a/spec/defines/manila_backend_hitachi_hnas_spec.rb
+++ b/spec/defines/manila_backend_hitachi_hnas_spec.rb
@@ -13,6 +13,7 @@ describe 'manila::backend::hitachi_hnas' do
       :hitachi_hnas_evs_id                 => '1',
       :hitachi_hnas_evs_ip                 => ' 172.24.53.1',
       :hitachi_hnas_file_system_name       => 'FS-Manila',
+      :backend_availability_zone           => 'my_zone',
     }
   end
 
diff --git a/spec/defines/manila_backend_lvm_spec.rb b/spec/defines/manila_backend_lvm_spec.rb
index 38530d74..4fc79add 100644
--- a/spec/defines/manila_backend_lvm_spec.rb
+++ b/spec/defines/manila_backend_lvm_spec.rb
@@ -13,6 +13,7 @@ describe 'manila::backend::lvm' do
         :lvm_share_mirrors            => 1,
         :lvm_share_volume_group       => 'lvm-shares',
         :lvm_share_helpers            => ['CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess','NFS=manila.share.drivers.helpers.NFSHelper'],
+        :backend_availability_zone    => 'my_zone',
       }
     end
 
@@ -27,6 +28,8 @@ describe 'manila::backend::lvm' do
       is_expected.to contain_manila_config('mylvm/lvm_share_volume_group').with_value('lvm-shares')
       is_expected.to contain_manila_config('mylvm/lvm_share_helpers').with_value(
         'CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess,NFS=manila.share.drivers.helpers.NFSHelper')
+      is_expected.to contain_manila_config('mylvm/backend_availability_zone').with_value(
+        'my_zone')
     end
   end
 
diff --git a/spec/defines/manila_backend_netapp_spec.rb b/spec/defines/manila_backend_netapp_spec.rb
index 04d0c188..552ad454 100644
--- a/spec/defines/manila_backend_netapp_spec.rb
+++ b/spec/defines/manila_backend_netapp_spec.rb
@@ -7,6 +7,7 @@ describe 'manila::backend::netapp' do
   let :params do
     {
       :driver_handles_share_servers        => true,
+      :backend_availability_zone           => 'my_zone',
       :netapp_login                        => 'netapp',
       :netapp_password                     => 'password',
       :netapp_server_hostname              => '127.0.0.2',
@@ -19,6 +20,7 @@ describe 'manila::backend::netapp' do
 
   let :default_params do
     {
+      :backend_availability_zone            => '<SERVICE DEFAULT>',
       :netapp_transport_type                => 'http',
       :netapp_storage_family                => 'ontap_cluster',
       :netapp_volume_name_template          => 'share_%(share_id)s',