diff --git a/manifests/profile/base/cinder/volume/dellemc_powerflex.pp b/manifests/profile/base/cinder/volume/dellemc_powerflex.pp
index b87666c16..d7a4d7978 100644
--- a/manifests/profile/base/cinder/volume/dellemc_powerflex.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_powerflex.pp
@@ -34,25 +34,25 @@ class tripleo::profile::base::cinder::volume::dellemc_powerflex (
   include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
-    cinder::backend::dellemc_powerflex { $backend_name :
-      backend_availability_zone                => hiera('cinder::backend::dellemc_powerflex::backend_availability_zone', undef),
-      san_login                                => hiera('cinder::backend::dellemc_powerflex::san_login', undef),
-      san_password                             => hiera('cinder::backend::dellemc_powerflex::san_password', undef),
-      san_ip                                   => hiera('cinder::backend::dellemc_powerflex::san_ip', undef),
-      powerflex_storage_pools                  => hiera('cinder::backend::dellemc_powerflex::powerflex_storage_pools', undef),
-      powerflex_allow_migration_during_rebuild => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_migration_during_rebuild',
-                                                        undef),
-      powerflex_allow_non_padded_volumes       => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_non_padded_volumes', undef),
-      powerflex_max_over_subscription_ratio    => hiera('cinder::backend::dellemc_powerflex::powerflex_max_over_subscription_ratio',
-                                                        undef),
-      powerflex_rest_server_port               => hiera('cinder::backend::dellemc_powerflex::powerflex_rest_server_port', undef),
-      powerflex_round_volume_capacity          => hiera('cinder::backend::dellemc_powerflex::powerflex_round_volume_capacity', undef),
-      powerflex_server_api_version             => hiera('cinder::backend::dellemc_powerflex::powerflex_server_api_version', undef),
-      powerflex_unmap_volume_before_deletion   => hiera('cinder::backend::dellemc_powerflex::powerflex_unmap_volume_before_deletion',
-                                                        undef),
-      san_thin_provision                       => hiera('cinder::backend::dellemc_powerflex::san_thin_provision', undef),
-      driver_ssl_cert_verify                   => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_verify', undef),
-      driver_ssl_cert_path                     => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_path', undef)
-    }
+    create_resources('cinder::backend::dellemc_powerflex', { $backend_name => delete_undef_values({
+      'backend_availability_zone'                => hiera('cinder::backend::dellemc_powerflex::backend_availability_zone', undef),
+      'san_login'                                => hiera('cinder::backend::dellemc_powerflex::san_login', undef),
+      'san_password'                             => hiera('cinder::backend::dellemc_powerflex::san_password', undef),
+      'san_ip'                                   => hiera('cinder::backend::dellemc_powerflex::san_ip', undef),
+      'powerflex_storage_pools'                  => hiera('cinder::backend::dellemc_powerflex::powerflex_storage_pools', undef),
+      'powerflex_allow_migration_during_rebuild' => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_migration_during_rebuild',
+                                                          undef),
+      'powerflex_allow_non_padded_volumes'       => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_non_padded_volumes', undef),
+      'powerflex_max_over_subscription_ratio'    => hiera('cinder::backend::dellemc_powerflex::powerflex_max_over_subscription_ratio',
+                                                          undef),
+      'powerflex_rest_server_port'               => hiera('cinder::backend::dellemc_powerflex::powerflex_rest_server_port', undef),
+      'powerflex_round_volume_capacity'          => hiera('cinder::backend::dellemc_powerflex::powerflex_round_volume_capacity', undef),
+      'powerflex_server_api_version'             => hiera('cinder::backend::dellemc_powerflex::powerflex_server_api_version', undef),
+      'powerflex_unmap_volume_before_deletion'   => hiera('cinder::backend::dellemc_powerflex::powerflex_unmap_volume_before_deletion',
+                                                          undef),
+      'san_thin_provision'                       => hiera('cinder::backend::dellemc_powerflex::san_thin_provision', undef),
+      'driver_ssl_cert_verify'                   => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_verify', undef),
+      'driver_ssl_cert_path'                     => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_path', undef)
+    })})
   }
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_powermax.pp b/manifests/profile/base/cinder/volume/dellemc_powermax.pp
index ad350cccd..a861fa150 100644
--- a/manifests/profile/base/cinder/volume/dellemc_powermax.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_powermax.pp
@@ -54,16 +54,16 @@ class tripleo::profile::base::cinder::volume::dellemc_powermax (
     any2array($backend_name).each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::dellemc_powermax { $backend :
-        backend_availability_zone => $backend_config['CinderPowermaxAvailabilityZone'],
-        san_ip                    => $backend_config['CinderPowermaxSanIp'],
-        san_login                 => $backend_config['CinderPowermaxSanLogin'],
-        san_password              => $backend_config['CinderPowermaxSanPassword'],
-        powermax_storage_protocol => $backend_config['CinderPowermaxStorageProtocol'],
-        powermax_array            => $backend_config['CinderPowermaxArray'],
-        powermax_srp              => $backend_config['CinderPowermaxSrp'],
-        powermax_port_groups      => $backend_config['CinderPowermaxPortGroups'],
-      }
+      create_resources('cinder::backend::dellemc_powermax', { $backend => delete_undef_values({
+        'backend_availability_zone' => $backend_config['CinderPowermaxAvailabilityZone'],
+        'san_ip'                    => $backend_config['CinderPowermaxSanIp'],
+        'san_login'                 => $backend_config['CinderPowermaxSanLogin'],
+        'san_password'              => $backend_config['CinderPowermaxSanPassword'],
+        'powermax_storage_protocol' => $backend_config['CinderPowermaxStorageProtocol'],
+        'powermax_array'            => $backend_config['CinderPowermaxArray'],
+        'powermax_srp'              => $backend_config['CinderPowermaxSrp'],
+        'powermax_port_groups'      => $backend_config['CinderPowermaxPortGroups'],
+      })})
     }
   }
 
diff --git a/manifests/profile/base/cinder/volume/dellemc_powerstore.pp b/manifests/profile/base/cinder/volume/dellemc_powerstore.pp
index 13f49de92..daa23bf43 100644
--- a/manifests/profile/base/cinder/volume/dellemc_powerstore.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_powerstore.pp
@@ -53,15 +53,15 @@ class tripleo::profile::base::cinder::volume::dellemc_powerstore (
     any2array($backend_name).each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::dellemc_powerstore { $backend :
-        backend_availability_zone => $backend_config['CinderPowerStoreAvailabilityZone'],
-        san_ip                    => $backend_config['CinderPowerStoreSanIp'],
-        san_login                 => $backend_config['CinderPowerStoreSanLogin'],
-        san_password              => $backend_config['CinderPowerStoreSanPassword'],
-        storage_protocol          => $backend_config['CinderPowerStoreStorageProtocol'],
-        powerstore_appliances     => $backend_config['CinderPowerStoreAppliances'],
-        powerstore_ports          => $backend_config['CinderPowerStorePorts'],
-      }
+      create_resources('cinder::backend::dellemc_powerstore', { $backend => delete_undef_values({
+        'backend_availability_zone' => $backend_config['CinderPowerStoreAvailabilityZone'],
+        'san_ip'                    => $backend_config['CinderPowerStoreSanIp'],
+        'san_login'                 => $backend_config['CinderPowerStoreSanLogin'],
+        'san_password'              => $backend_config['CinderPowerStoreSanPassword'],
+        'storage_protocol'          => $backend_config['CinderPowerStoreStorageProtocol'],
+        'powerstore_appliances'     => $backend_config['CinderPowerStoreAppliances'],
+        'powerstore_ports'          => $backend_config['CinderPowerStorePorts'],
+      })})
     }
   }
 
diff --git a/manifests/profile/base/cinder/volume/dellemc_sc.pp b/manifests/profile/base/cinder/volume/dellemc_sc.pp
index 166b8ecba..48db92acc 100644
--- a/manifests/profile/base/cinder/volume/dellemc_sc.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_sc.pp
@@ -63,25 +63,25 @@ class tripleo::profile::base::cinder::volume::dellemc_sc (
     any2array($backend_name).each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::dellemc_sc { $backend :
-        backend_availability_zone    => $backend_config['CinderSCAvailabilityZone'],
-        san_ip                       => $backend_config['CinderSCSanIp'],
-        san_login                    => $backend_config['CinderSCSanLogin'],
-        san_password                 => $backend_config['CinderSCSanPassword'],
-        sc_storage_protocol          => $backend_config['CinderSCStorageProtocol'],
-        dell_sc_ssn                  => $backend_config['CinderSCSSN'],
-        target_ip_address            => $backend_config['CinderSCTargetIpAddress'],
-        target_port                  => $backend_config['CinderSCTargetPort'],
-        dell_sc_api_port             => $backend_config['CinderSCApiPort'],
-        dell_sc_server_folder        => $backend_config['CinderSCServerFolder'],
-        dell_sc_volume_folder        => $backend_config['CinderSCVolumeFolder'],
-        excluded_domain_ips          => $backend_config['CinderSCExcludedDomainIps'],
-        secondary_san_ip             => $backend_config['CinderSCSecondarySanIp'],
-        secondary_san_login          => $backend_config['CinderSCSecondarySanLogin'],
-        secondary_san_password       => $backend_config['CinderSCSecondarySanPassword'],
-        secondary_sc_api_port        => $backend_config['CinderSCSecondaryApiPort'],
-        use_multipath_for_image_xfer => $backend_config['CinderSCUseMultipathForImageXfer'],
-      }
+      create_resources('cinder::backend::dellemc_sc', { $backend => delete_undef_values({
+        'backend_availability_zone'    => $backend_config['CinderSCAvailabilityZone'],
+        'san_ip'                       => $backend_config['CinderSCSanIp'],
+        'san_login'                    => $backend_config['CinderSCSanLogin'],
+        'san_password'                 => $backend_config['CinderSCSanPassword'],
+        'sc_storage_protocol'          => $backend_config['CinderSCStorageProtocol'],
+        'dell_sc_ssn'                  => $backend_config['CinderSCSSN'],
+        'target_ip_address'            => $backend_config['CinderSCTargetIpAddress'],
+        'target_port'                  => $backend_config['CinderSCTargetPort'],
+        'dell_sc_api_port'             => $backend_config['CinderSCApiPort'],
+        'dell_sc_server_folder'        => $backend_config['CinderSCServerFolder'],
+        'dell_sc_volume_folder'        => $backend_config['CinderSCVolumeFolder'],
+        'excluded_domain_ips'          => $backend_config['CinderSCExcludedDomainIps'],
+        'secondary_san_ip'             => $backend_config['CinderSCSecondarySanIp'],
+        'secondary_san_login'          => $backend_config['CinderSCSecondarySanLogin'],
+        'secondary_san_password'       => $backend_config['CinderSCSecondarySanPassword'],
+        'secondary_sc_api_port'        => $backend_config['CinderSCSecondaryApiPort'],
+        'use_multipath_for_image_xfer' => $backend_config['CinderSCUseMultipathForImageXfer'],
+      })})
     }
   }
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_unity.pp b/manifests/profile/base/cinder/volume/dellemc_unity.pp
index 02194d47e..9e7f9a56c 100644
--- a/manifests/profile/base/cinder/volume/dellemc_unity.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_unity.pp
@@ -34,15 +34,15 @@ class tripleo::profile::base::cinder::volume::dellemc_unity (
   include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
-    cinder::backend::dellemc_unity { $backend_name :
-      backend_availability_zone => hiera('cinder::backend::dellemc_unity::backend_availability_zone', undef),
-      san_ip                    => hiera('cinder::backend::dellemc_unity::san_ip', undef),
-      san_login                 => hiera('cinder::backend::dellemc_unity::san_login', undef),
-      san_password              => hiera('cinder::backend::dellemc_unity::san_password', undef),
-      storage_protocol          => hiera('cinder::backend::dellemc_unity::storage_protocol', undef),
-      unity_io_ports            => hiera('cinder::backend::dellemc_unity::unity_io_ports', undef),
-      unity_storage_pool_names  => hiera('cinder::backend::dellemc_unity::unity_storage_pool_names', undef),
-    }
+    create_resources('cinder::backend::dellemc_unity', { $backend_name => delete_undef_values({
+      'backend_availability_zone' => hiera('cinder::backend::dellemc_unity::backend_availability_zone', undef),
+      'san_ip'                    => hiera('cinder::backend::dellemc_unity::san_ip', undef),
+      'san_login'                 => hiera('cinder::backend::dellemc_unity::san_login', undef),
+      'san_password'              => hiera('cinder::backend::dellemc_unity::san_password', undef),
+      'storage_protocol'          => hiera('cinder::backend::dellemc_unity::storage_protocol', undef),
+      'unity_io_ports'            => hiera('cinder::backend::dellemc_unity::unity_io_ports', undef),
+      'unity_storage_pool_names'  => hiera('cinder::backend::dellemc_unity::unity_storage_pool_names', undef),
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
index b98422281..fa3a0afb7 100644
--- a/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
@@ -36,10 +36,10 @@ class tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi (
   warning('The tripleo_dellemc_vmax_iscsi class is not supported, please use the triplo_dellemc_powermax resource instead.')
 
   if $step >= 4 {
-    cinder::backend::dellemc_vmax_iscsi { $backend_name :
-      backend_availability_zone => hiera('cinder::backend::dellemc_vmax_iscsi::backend_availability_zone', undef),
-      cinder_emc_config_file    => hiera('cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file', undef),
-    }
+    create_resources('cinder::backend::dellemc_vmax_iscsi', { $backend_name => delete_undef_values({
+      'backend_availability_zone' => hiera('cinder::backend::dellemc_vmax_iscsi::backend_availability_zone', undef),
+      'cinder_emc_config_file'    => hiera('cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file', undef),
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_vnx.pp b/manifests/profile/base/cinder/volume/dellemc_vnx.pp
index ba8465142..1c82737a0 100644
--- a/manifests/profile/base/cinder/volume/dellemc_vnx.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_vnx.pp
@@ -39,20 +39,20 @@ class tripleo::profile::base::cinder::volume::dellemc_vnx (
                                         hiera('cinder::backend::emc_vnx::storage_vnx_pool_name',
                                         undef)))
 
-    cinder::backend::emc_vnx { $backend_name :
-      backend_availability_zone     => hiera('cinder::backend::emc_vnx::backend_availability_zone', undef),
-      san_ip                        => hiera('cinder::backend::emc_vnx::san_ip', undef),
-      san_login                     => hiera('cinder::backend::emc_vnx::san_login', undef),
-      san_password                  => hiera('cinder::backend::emc_vnx::san_password', undef),
-      storage_protocol              => hiera('cinder::backend::emc_vnx::storage_protocol', undef),
-      storage_vnx_pool_names        => hiera('cinder::backend::emc_vnx::storage_vnx_pool_names', undef),
-      default_timeout               => hiera('cinder::backend::emc_vnx::default_timeout', undef),
-      max_luns_per_storage_group    => hiera('cinder::backend::emc_vnx::max_luns_per_storage_group', undef),
-      initiator_auto_registration   => hiera('cinder::backend::emc_vnx::initiator_auto_registration', undef),
-      storage_vnx_auth_type         => hiera('cinder::backend::emc_vnx::storage_vnx_auth_type', undef),
-      storage_vnx_security_file_dir => hiera('cinder::backend::emc_vnx::storage_vnx_security_file_dir', undef),
-      naviseccli_path               => hiera('cinder::backend::emc_vnx::naviseccli_path', undef),
-    }
+    create_resources('cinder::backend::emc_vnx', { $backend_name => delete_undef_values({
+      'backend_availability_zone'     => hiera('cinder::backend::emc_vnx::backend_availability_zone', undef),
+      'san_ip'                        => hiera('cinder::backend::emc_vnx::san_ip', undef),
+      'san_login'                     => hiera('cinder::backend::emc_vnx::san_login', undef),
+      'san_password'                  => hiera('cinder::backend::emc_vnx::san_password', undef),
+      'storage_protocol'              => hiera('cinder::backend::emc_vnx::storage_protocol', undef),
+      'storage_vnx_pool_names'        => hiera('cinder::backend::emc_vnx::storage_vnx_pool_names', undef),
+      'default_timeout'               => hiera('cinder::backend::emc_vnx::default_timeout', undef),
+      'max_luns_per_storage_group'    => hiera('cinder::backend::emc_vnx::max_luns_per_storage_group', undef),
+      'initiator_auto_registration'   => hiera('cinder::backend::emc_vnx::initiator_auto_registration', undef),
+      'storage_vnx_auth_type'         => hiera('cinder::backend::emc_vnx::storage_vnx_auth_type', undef),
+      'storage_vnx_security_file_dir' => hiera('cinder::backend::emc_vnx::storage_vnx_security_file_dir', undef),
+      'naviseccli_path'               => hiera('cinder::backend::emc_vnx::naviseccli_path', undef),
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_vxflexos.pp b/manifests/profile/base/cinder/volume/dellemc_vxflexos.pp
index 34170697f..7247e95f1 100644
--- a/manifests/profile/base/cinder/volume/dellemc_vxflexos.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_vxflexos.pp
@@ -36,22 +36,22 @@ class tripleo::profile::base::cinder::volume::dellemc_vxflexos (
   warning('The dellemc_vxflexos class will be removed in W-Release, please use dellemc_powerflex instead.')
 
   if $step >= 4 {
-    cinder::backend::dellemc_vxflexos { $backend_name :
-      backend_availability_zone               => hiera('cinder::backend::dellemc_vxflexos::backend_availability_zone', undef),
-      san_login                               => hiera('cinder::backend::dellemc_vxflexos::san_login', undef),
-      san_password                            => hiera('cinder::backend::dellemc_vxflexos::san_password', undef),
-      san_ip                                  => hiera('cinder::backend::dellemc_vxflexos::san_ip', undef),
-      vxflexos_storage_pools                  => hiera('cinder::backend::dellemc_vxflexos::vxflexos_storage_pools', undef),
-      vxflexos_allow_migration_during_rebuild => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_migration_during_rebuild', undef),
-      vxflexos_allow_non_padded_volumes       => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_non_padded_volumes', undef),
-      vxflexos_max_over_subscription_ratio    => hiera('cinder::backend::dellemc_vxflexos::vxflexos_max_over_subscription_ratio', undef),
-      vxflexos_rest_server_port               => hiera('cinder::backend::dellemc_vxflexos::vxflexos_rest_server_port', undef),
-      vxflexos_round_volume_capacity          => hiera('cinder::backend::dellemc_vxflexos::vxflexos_round_volume_capacity', undef),
-      vxflexos_server_api_version             => hiera('cinder::backend::dellemc_vxflexos::vxflexos_server_api_version', undef),
-      vxflexos_unmap_volume_before_deletion   => hiera('cinder::backend::dellemc_vxflexos::vxflexos_unmap_volume_before_deletion', undef),
-      san_thin_provision                      => hiera('cinder::backend::dellemc_vxflexos::san_thin_provision', undef),
-      driver_ssl_cert_verify                  => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_verify', undef),
-      driver_ssl_cert_path                    => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_path', undef)
-    }
+    create_resources('cinder::backend::dellemc_vxflexos', { $backend_name => delete_undef_values({
+      'backend_availability_zone'               => hiera('cinder::backend::dellemc_vxflexos::backend_availability_zone', undef),
+      'san_login'                               => hiera('cinder::backend::dellemc_vxflexos::san_login', undef),
+      'san_password'                            => hiera('cinder::backend::dellemc_vxflexos::san_password', undef),
+      'san_ip'                                  => hiera('cinder::backend::dellemc_vxflexos::san_ip', undef),
+      'vxflexos_storage_pools'                  => hiera('cinder::backend::dellemc_vxflexos::vxflexos_storage_pools', undef),
+      'vxflexos_allow_migration_during_rebuild' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_migration_during_rebuild', undef),
+      'vxflexos_allow_non_padded_volumes'       => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_non_padded_volumes', undef),
+      'vxflexos_max_over_subscription_ratio'    => hiera('cinder::backend::dellemc_vxflexos::vxflexos_max_over_subscription_ratio', undef),
+      'vxflexos_rest_server_port'               => hiera('cinder::backend::dellemc_vxflexos::vxflexos_rest_server_port', undef),
+      'vxflexos_round_volume_capacity'          => hiera('cinder::backend::dellemc_vxflexos::vxflexos_round_volume_capacity', undef),
+      'vxflexos_server_api_version'             => hiera('cinder::backend::dellemc_vxflexos::vxflexos_server_api_version', undef),
+      'vxflexos_unmap_volume_before_deletion'   => hiera('cinder::backend::dellemc_vxflexos::vxflexos_unmap_volume_before_deletion', undef),
+      'san_thin_provision'                      => hiera('cinder::backend::dellemc_vxflexos::san_thin_provision', undef),
+      'driver_ssl_cert_verify'                  => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_verify', undef),
+      'driver_ssl_cert_path'                    => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_path', undef)
+    })})
   }
 }
diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
index 1f798283e..8fdf85fca 100644
--- a/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
@@ -56,18 +56,18 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
     any2array($backend_name).each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::dellemc_xtremio { $backend :
-        backend_availability_zone         => $backend_config['CinderXtremioAvailabilityZone'],
-        san_ip                            => $backend_config['CinderXtremioSanIp'],
-        san_login                         => $backend_config['CinderXtremioSanLogin'],
-        san_password                      => $backend_config['CinderXtremioSanPassword'],
-        xtremio_storage_protocol          => $backend_config['CinderXtremioStorageProtocol'],
-        xtremio_cluster_name              => $backend_config['CinderXtremioClusterName'],
-        xtremio_array_busy_retry_count    => $backend_config['CinderXtremioArrayBusyRetryCount'],
-        xtremio_array_busy_retry_interval => $backend_config['CinderXtremioArrayBusyRetryInterval'],
-        xtremio_volumes_per_glance_cache  => $backend_config['CinderXtremioVolumesPerGlanceCache'],
-        xtremio_ports                     => $backend_config['CinderXtremioPorts'],
-      }
+      create_resources('cinder::backend::dellemc_xtremio', { $backend => delete_undef_values({
+        'backend_availability_zone'         => $backend_config['CinderXtremioAvailabilityZone'],
+        'san_ip'                            => $backend_config['CinderXtremioSanIp'],
+        'san_login'                         => $backend_config['CinderXtremioSanLogin'],
+        'san_password'                      => $backend_config['CinderXtremioSanPassword'],
+        'xtremio_storage_protocol'          => $backend_config['CinderXtremioStorageProtocol'],
+        'xtremio_cluster_name'              => $backend_config['CinderXtremioClusterName'],
+        'xtremio_array_busy_retry_count'    => $backend_config['CinderXtremioArrayBusyRetryCount'],
+        'xtremio_array_busy_retry_interval' => $backend_config['CinderXtremioArrayBusyRetryInterval'],
+        'xtremio_volumes_per_glance_cache'  => $backend_config['CinderXtremioVolumesPerGlanceCache'],
+        'xtremio_ports'                     => $backend_config['CinderXtremioPorts'],
+      })})
     }
   }
 }
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index 6ed20e9dc..7fa43bd8e 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -42,24 +42,24 @@ class tripleo::profile::base::cinder::volume::dellsc (
     $excluded_domain_ips = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef)
     $excluded_domain_ips_real = pick_default($excluded_domain_ips, $excluded_domain_ip, undef)
 
-    cinder::backend::dellsc_iscsi { $backend_name :
-      backend_availability_zone    => hiera('cinder::backend::dellsc_iscsi::backend_availability_zone', undef),
-      san_ip                       => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
-      san_login                    => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
-      san_password                 => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
-      dell_sc_ssn                  => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
-      target_ip_address            => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
-      target_port                  => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
-      dell_sc_api_port             => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
-      dell_sc_server_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
-      dell_sc_volume_folder        => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
-      excluded_domain_ips          => $excluded_domain_ips_real,
-      secondary_san_ip             => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
-      secondary_san_login          => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
-      secondary_san_password       => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),
-      secondary_sc_api_port        => hiera('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef),
-      use_multipath_for_image_xfer => hiera('cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer', undef),
-    }
+    create_resources('cinder::backend::dellsc_iscsi', { $backend_name => delete_undef_values({
+      'backend_availability_zone'    => hiera('cinder::backend::dellsc_iscsi::backend_availability_zone', undef),
+      'san_ip'                       => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
+      'san_login'                    => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
+      'san_password'                 => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
+      'dell_sc_ssn'                  => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
+      'target_ip_address'            => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
+      'target_port'                  => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
+      'dell_sc_api_port'             => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
+      'dell_sc_server_folder'        => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
+      'dell_sc_volume_folder'        => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
+      'excluded_domain_ips'          => $excluded_domain_ips_real,
+      'secondary_san_ip'             => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
+      'secondary_san_login'          => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
+      'secondary_san_password'       => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),
+      'secondary_sc_api_port'        => hiera('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef),
+      'use_multipath_for_image_xfer' => hiera('cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer', undef),
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index c889d3072..b45ca7f4c 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -56,12 +56,12 @@ class tripleo::profile::base::cinder::volume::iscsi (
     # NOTE(gfidente): never emit in hieradata:
     # key: [ipv6]
     # as it will cause hiera parsing errors
-    cinder::backend::iscsi { $backend_name :
-      backend_availability_zone => $backend_availability_zone,
-      target_ip_address         => normalize_ip_for_uri($cinder_iscsi_address),
-      target_helper             => $cinder_iscsi_helper,
-      target_protocol           => $cinder_iscsi_protocol,
-    }
+    create_resources('cinder::backend::iscsi', { $backend_name => delete_undef_values({
+      'backend_availability_zone' => $backend_availability_zone,
+      'target_ip_address'         => normalize_ip_for_uri($cinder_iscsi_address),
+      'target_helper'             => $cinder_iscsi_helper,
+      'target_protocol'           => $cinder_iscsi_protocol,
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp
index df9f26d1d..1f066a4a6 100644
--- a/manifests/profile/base/cinder/volume/netapp.pp
+++ b/manifests/profile/base/cinder/volume/netapp.pp
@@ -68,31 +68,31 @@ class tripleo::profile::base::cinder::volume::netapp (
     any2array($backend_name).each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::netapp { $backend :
-        backend_availability_zone       => $backend_config['CinderNetappAvailabilityZone'],
-        netapp_login                    => $backend_config['CinderNetappLogin'],
-        netapp_password                 => $backend_config['CinderNetappPassword'],
-        netapp_server_hostname          => $backend_config['CinderNetappServerHostname'],
-        netapp_server_port              => $backend_config['CinderNetappServerPort'],
-        netapp_size_multiplier          => $backend_config['CinderNetappSizeMultiplier'],
-        netapp_storage_family           => $backend_config['CinderNetappStorageFamily'],
-        netapp_storage_protocol         => $backend_config['CinderNetappStorageProtocol'],
-        netapp_transport_type           => $backend_config['CinderNetappTransportType'],
-        netapp_vfiler                   => $backend_config['CinderNetappVfiler'],
-        netapp_vserver                  => $backend_config['CinderNetappVserver'],
-        netapp_partner_backend_name     => $backend_config['CinderNetappPartnerBackendName'],
-        nfs_shares                      => any2array($backend_config['CinderNetappNfsShares']),
-        nfs_shares_config               => $backend_config['CinderNetappNfsSharesConfig'],
-        nfs_mount_options               => $backend_config['CinderNetappNfsMountOptions'],
-        netapp_copyoffload_tool_path    => $backend_config['CinderNetappCopyOffloadToolPath'],
-        netapp_controller_ips           => $backend_config['CinderNetappControllerIps'],
-        netapp_sa_password              => $backend_config['CinderNetappSaPassword'],
-        netapp_host_type                => $backend_config['CinderNetappHostType'],
-        netapp_webservice_path          => $backend_config['CinderNetappWebservicePath'],
-        nas_secure_file_operations      => $backend_config['CinderNetappNasSecureFileOperations'],
-        nas_secure_file_permissions     => $backend_config['CinderNetappNasSecureFilePermissions'],
-        netapp_pool_name_search_pattern => $backend_config['CinderNetappPoolNameSearchPattern'],
-      }
+      create_resources('cinder::backend::netapp', { $backend => delete_undef_values({
+        'backend_availability_zone'       => $backend_config['CinderNetappAvailabilityZone'],
+        'netapp_login'                    => $backend_config['CinderNetappLogin'],
+        'netapp_password'                 => $backend_config['CinderNetappPassword'],
+        'netapp_server_hostname'          => $backend_config['CinderNetappServerHostname'],
+        'netapp_server_port'              => $backend_config['CinderNetappServerPort'],
+        'netapp_size_multiplier'          => $backend_config['CinderNetappSizeMultiplier'],
+        'netapp_storage_family'           => $backend_config['CinderNetappStorageFamily'],
+        'netapp_storage_protocol'         => $backend_config['CinderNetappStorageProtocol'],
+        'netapp_transport_type'           => $backend_config['CinderNetappTransportType'],
+        'netapp_vfiler'                   => $backend_config['CinderNetappVfiler'],
+        'netapp_vserver'                  => $backend_config['CinderNetappVserver'],
+        'netapp_partner_backend_name'     => $backend_config['CinderNetappPartnerBackendName'],
+        'nfs_shares'                      => any2array($backend_config['CinderNetappNfsShares']),
+        'nfs_shares_config'               => $backend_config['CinderNetappNfsSharesConfig'],
+        'nfs_mount_options'               => $backend_config['CinderNetappNfsMountOptions'],
+        'netapp_copyoffload_tool_path'    => $backend_config['CinderNetappCopyOffloadToolPath'],
+        'netapp_controller_ips'           => $backend_config['CinderNetappControllerIps'],
+        'netapp_sa_password'              => $backend_config['CinderNetappSaPassword'],
+        'netapp_host_type'                => $backend_config['CinderNetappHostType'],
+        'netapp_webservice_path'          => $backend_config['CinderNetappWebservicePath'],
+        'nas_secure_file_operations'      => $backend_config['CinderNetappNasSecureFileOperations'],
+        'nas_secure_file_permissions'     => $backend_config['CinderNetappNasSecureFilePermissions'],
+        'netapp_pool_name_search_pattern' => $backend_config['CinderNetappPoolNameSearchPattern'],
+      })})
     }
   }
 
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index 7366e5fcb..4d9877ad2 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -73,15 +73,17 @@ class tripleo::profile::base::cinder::volume::nfs (
 
   if $step >= 4 {
     package {'nfs-utils': }
-    -> cinder::backend::nfs { $backend_name :
-      backend_availability_zone   => $backend_availability_zone,
-      nfs_servers                 => $cinder_nfs_servers,
-      nfs_mount_options           => $cinder_nfs_mount_options,
-      nfs_shares_config           => '/etc/cinder/shares-nfs.conf',
-      nfs_snapshot_support        => $cinder_nfs_snapshot_support,
-      nas_secure_file_operations  => $cinder_nas_secure_file_operations,
-      nas_secure_file_permissions => $cinder_nas_secure_file_permissions,
-    }
+
+    create_resources('cinder::backend::nfs', { $backend_name => delete_undef_values({
+      'backend_availability_zone'   => $backend_availability_zone,
+      'nfs_servers'                 => $cinder_nfs_servers,
+      'nfs_mount_options'           => $cinder_nfs_mount_options,
+      'nfs_shares_config'           => '/etc/cinder/shares-nfs.conf',
+      'nfs_snapshot_support'        => $cinder_nfs_snapshot_support,
+      'nas_secure_file_operations'  => $cinder_nas_secure_file_operations,
+      'nas_secure_file_permissions' => $cinder_nas_secure_file_permissions,
+    })})
+    Package['nfs-utils'] -> Cinder::Backend::Nfs[$backend_name]
 
     if str2bool($::selinux) {
       selboolean { 'virt_use_nfs':
diff --git a/manifests/profile/base/cinder/volume/nvmeof.pp b/manifests/profile/base/cinder/volume/nvmeof.pp
index 8ebd9b465..a035a1752 100644
--- a/manifests/profile/base/cinder/volume/nvmeof.pp
+++ b/manifests/profile/base/cinder/volume/nvmeof.pp
@@ -62,18 +62,18 @@ class tripleo::profile::base::cinder::volume::nvmeof (
   include tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
-    cinder::backend::nvmeof { $volume_backend_name :
-      target_ip_address         => normalize_ip_for_uri($target_ip_address),
-      target_port               => $target_port,
-      target_helper             => $target_helper,
-      target_protocol           => $target_protocol,
-      target_prefix             => $target_prefix,
-      nvmet_port_id             => $nvmet_port_id,
-      nvmet_ns_id               => $nvmet_ns_id,
-      volume_backend_name       => $volume_backend_name,
-      backend_availability_zone => $backend_availability_zone,
-      volume_driver             => $volume_driver,
-    }
+    create_resources('cinder::backend::nvmeof', { $volume_backend_name => delete_undef_values({
+      'target_ip_address'         => normalize_ip_for_uri($target_ip_address),
+      'target_port'               => $target_port,
+      'target_helper'             => $target_helper,
+      'target_protocol'           => $target_protocol,
+      'target_prefix'             => $target_prefix,
+      'nvmet_port_id'             => $nvmet_port_id,
+      'nvmet_ns_id'               => $nvmet_ns_id,
+      'volume_backend_name'       => $volume_backend_name,
+      'backend_availability_zone' => $backend_availability_zone,
+      'volume_driver'             => $volume_driver,
+    })})
   }
 
 }
diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp
index 6ba347668..9d657d32d 100644
--- a/manifests/profile/base/cinder/volume/pure.pp
+++ b/manifests/profile/base/cinder/volume/pure.pp
@@ -52,15 +52,15 @@ class tripleo::profile::base::cinder::volume::pure (
     $backend_name.each |String $backend| {
       $backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))
 
-      cinder::backend::pure { $backend :
-        backend_availability_zone    => $backend_config['CinderPureAvailabilityZone'],
-        san_ip                       => $backend_config['CinderPureSanIp'],
-        pure_api_token               => $backend_config['CinderPureAPIToken'],
-        pure_storage_protocol        => $backend_config['CinderPureStorageProtocol'],
-        use_chap_auth                => $backend_config['CinderPureUseChap'],
-        use_multipath_for_image_xfer => $backend_config['CinderPureMultipathXfer'],
-        image_volume_cache_enabled   => $backend_config['CinderPureImageCache'],
-      }
+      create_resources('cinder::backend::pure', { $backend => delete_undef_values({
+        'backend_availability_zone'    => $backend_config['CinderPureAvailabilityZone'],
+        'san_ip'                       => $backend_config['CinderPureSanIp'],
+        'pure_api_token'               => $backend_config['CinderPureAPIToken'],
+        'pure_storage_protocol'        => $backend_config['CinderPureStorageProtocol'],
+        'use_chap_auth'                => $backend_config['CinderPureUseChap'],
+        'use_multipath_for_image_xfer' => $backend_config['CinderPureMultipathXfer'],
+        'image_volume_cache_enabled'   => $backend_config['CinderPureImageCache'],
+      })})
     }
   }
 }
diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp
index 4954098c5..a767a7d46 100644
--- a/manifests/profile/base/cinder/volume/rbd.pp
+++ b/manifests/profile/base/cinder/volume/rbd.pp
@@ -104,26 +104,26 @@ class tripleo::profile::base::cinder::volume::rbd (
 
       $backend_config = merge($backend_defaults, $backend_multi_config)
 
-      cinder::backend::rbd { $backend :
-        backend_availability_zone        => $backend_config['CinderRbdAvailabilityZone'],
-        backend_host                     => $cinder_rbd_backend_host,
-        rbd_ceph_conf                    => $backend_ceph_conf,
-        rbd_pool                         => $backend_config['CinderRbdPoolName'],
-        rbd_user                         => $backend_config['CephClientUserName'],
-        rbd_secret_uuid                  => $backend_config['CephClusterFSID'],
-        rbd_flatten_volume_from_snapshot => $backend_config['CinderRbdFlattenVolumeFromSnapshot'],
-      }
+      create_resources('cinder::backend::rbd', { $backend => delete_undef_values({
+        'backend_availability_zone'        => $backend_config['CinderRbdAvailabilityZone'],
+        'backend_host'                     => $cinder_rbd_backend_host,
+        'rbd_ceph_conf'                    => $backend_ceph_conf,
+        'rbd_pool'                         => $backend_config['CinderRbdPoolName'],
+        'rbd_user'                         => $backend_config['CephClientUserName'],
+        'rbd_secret_uuid'                  => $backend_config['CephClusterFSID'],
+        'rbd_flatten_volume_from_snapshot' => $backend_config['CinderRbdFlattenVolumeFromSnapshot'],
+      })})
 
       any2array($backend_config['CinderRbdExtraPools']).each |String $pool_name| {
-        cinder::backend::rbd { "${backend}_${pool_name}" :
-          backend_availability_zone        => $backend_config['CinderRbdAvailabilityZone'],
-          backend_host                     => $cinder_rbd_backend_host,
-          rbd_ceph_conf                    => $backend_ceph_conf,
-          rbd_pool                         => $pool_name,
-          rbd_user                         => $backend_config['CephClientUserName'],
-          rbd_secret_uuid                  => $backend_config['CephClusterFSID'],
-          rbd_flatten_volume_from_snapshot => $backend_config['CinderRbdFlattenVolumeFromSnapshot'],
-        }
+        create_resources('cinder::backend::rbd', { "${backend}_${pool_name}" => delete_undef_values({
+          'backend_availability_zone'        => $backend_config['CinderRbdAvailabilityZone'],
+          'backend_host'                     => $cinder_rbd_backend_host,
+          'rbd_ceph_conf'                    => $backend_ceph_conf,
+          'rbd_pool'                         => $pool_name,
+          'rbd_user'                         => $backend_config['CephClientUserName'],
+          'rbd_secret_uuid'                  => $backend_config['CephClusterFSID'],
+          'rbd_flatten_volume_from_snapshot' => $backend_config['CinderRbdFlattenVolumeFromSnapshot'],
+        })})
       }
     }
   }
diff --git a/manifests/profile/base/cinder/volume/scaleio.pp b/manifests/profile/base/cinder/volume/scaleio.pp
index 589d34a74..7834f4036 100644
--- a/manifests/profile/base/cinder/volume/scaleio.pp
+++ b/manifests/profile/base/cinder/volume/scaleio.pp
@@ -37,24 +37,24 @@ class tripleo::profile::base::cinder::volume::scaleio (
   warning('The scaleio class will be removed in W-Release, please use the dellemc_vxflexos resource instead.')
 
   if $step >= 4 {
-    cinder::backend::scaleio { $backend_name :
-      backend_availability_zone        => hiera('cinder::backend::scaleio::backend_availability_zone', undef),
-      sio_login                        => hiera('cinder::backend::scaleio::sio_login', undef),
-      sio_password                     => hiera('cinder::backend::scaleio::sio_password', undef),
-      sio_server_hostname              => hiera('cinder::backend::scaleio::sio_server_hostname', undef),
-      sio_server_port                  => hiera('cinder::backend::scaleio::sio_server_port', undef),
-      sio_verify_server_certificate    => hiera('cinder::backend::scaleio::sio_verify_server_certificate', undef),
-      sio_server_certificate_path      => hiera('cinder::backend::scaleio::sio_server_certificate_path', undef),
-      sio_protection_domain_name       => hiera('cinder::backend::scaleio::sio_protection_domain_name', undef),
-      sio_protection_domain_id         => hiera('cinder::backend::scaleio::sio_protection_domain_id', undef),
-      sio_storage_pool_id              => hiera('cinder::backend::scaleio::sio_storage_pool_id', undef),
-      sio_storage_pool_name            => hiera('cinder::backend::scaleio::sio_storage_pool_name', undef),
-      sio_storage_pools                => hiera('cinder::backend::scaleio::sio_storage_pools', undef),
-      sio_round_volume_capacity        => hiera('cinder::backend::scaleio::sio_round_volume_capacity', undef),
-      sio_unmap_volume_before_deletion => hiera('cinder::backend::scaleio::sio_unmap_volume_before_deletion', undef),
-      sio_max_over_subscription_ratio  => hiera('cinder::backend::scaleio::sio_max_over_subscription_ratio', undef),
-      sio_thin_provision               => hiera('cinder::backend::scaleio::sio_thin_provision', undef),
-    }
+    create_resources('cinder::backend::scaleio', { $backend_name => delete_undef_values({
+      'backend_availability_zone'        => hiera('cinder::backend::scaleio::backend_availability_zone', undef),
+      'sio_login'                        => hiera('cinder::backend::scaleio::sio_login', undef),
+      'sio_password'                     => hiera('cinder::backend::scaleio::sio_password', undef),
+      'sio_server_hostname'              => hiera('cinder::backend::scaleio::sio_server_hostname', undef),
+      'sio_server_port'                  => hiera('cinder::backend::scaleio::sio_server_port', undef),
+      'sio_verify_server_certificate'    => hiera('cinder::backend::scaleio::sio_verify_server_certificate', undef),
+      'sio_server_certificate_path'      => hiera('cinder::backend::scaleio::sio_server_certificate_path', undef),
+      'sio_protection_domain_name'       => hiera('cinder::backend::scaleio::sio_protection_domain_name', undef),
+      'sio_protection_domain_id'         => hiera('cinder::backend::scaleio::sio_protection_domain_id', undef),
+      'sio_storage_pool_id'              => hiera('cinder::backend::scaleio::sio_storage_pool_id', undef),
+      'sio_storage_pool_name'            => hiera('cinder::backend::scaleio::sio_storage_pool_name', undef),
+      'sio_storage_pools'                => hiera('cinder::backend::scaleio::sio_storage_pools', undef),
+      'sio_round_volume_capacity'        => hiera('cinder::backend::scaleio::sio_round_volume_capacity', undef),
+      'sio_unmap_volume_before_deletion' => hiera('cinder::backend::scaleio::sio_unmap_volume_before_deletion', undef),
+      'sio_max_over_subscription_ratio'  => hiera('cinder::backend::scaleio::sio_max_over_subscription_ratio', undef),
+      'sio_thin_provision'               => hiera('cinder::backend::scaleio::sio_thin_provision', undef),
+    })})
   }
 
 }
diff --git a/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb b/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
index 3dcfe6c0c..cc55e428d 100644
--- a/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
@@ -44,7 +44,9 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powermax' do
       context 'with multiple backends' do
         let(:params) { {
           :backend_name => ['tripleo_dellemc_powermax_1', 'tripleo_dellemc_powermax_2'],
-          :multi_config => { 'tripleo_dellemc_powermax_2' => { 'CinderPowermaxStorageProtocol' => 'FC' }},
+          :multi_config => { 'tripleo_dellemc_powermax_2' => {
+            'CinderPowermaxStorageProtocol' => 'FC'
+            }},
           :step         => 4,
         } }
 
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index c61a780f1..20cd7bec7 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -42,6 +42,56 @@ cinder::backup::s3::backup_s3_store_access_key: 1234
 cinder::backup::s3::backup_s3_store_secret_key: 5678
 cinder::rabbit_password: 'password'
 cinder::keystone::authtoken::password: 'password'
+# cinder backend related items
+cinder::backend::dellemc_powerflex::san_login: 'admin'
+cinder::backend::dellemc_powerflex::san_password: 'password'
+cinder::backend::dellemc_powerflex::san_ip: 'powerflex.example.com'
+cinder::backend::dellemc_powerflex::powerflex_storage_pools: 'domain1:pool1,domain2:pool2'
+cinder::backend::dellemc_powermax::san_ip: '127.0.0.2'
+cinder::backend::dellemc_powermax::san_login: 'Admin'
+cinder::backend::dellemc_powermax::san_password: '12345'
+cinder::backend::dellemc_powermax::powermax_array: '000123456789'
+cinder::backend::dellemc_powermax::powermax_srp: 'SRP_1'
+cinder::backend::dellemc_powermax::powermax_port_groups: '[OS-ISCSI-PG]'
+cinder::backend::dellemc_powerstore::san_ip: '172.23.8.101'
+cinder::backend::dellemc_powerstore::san_login: 'Admin'
+cinder::backend::dellemc_powerstore::san_password: '12345'
+cinder::backend::dellemc_sc::san_ip: '172.23.8.101'
+cinder::backend::dellemc_sc::san_login: 'Admin'
+cinder::backend::dellemc_sc::san_password: '12345'
+cinder::backend::dellemc_sc::dell_sc_ssn: '64720'
+cinder::backend::dellemc_unity::san_ip: '172.23.8.101'
+cinder::backend::dellemc_unity::san_login: 'Admin'
+cinder::backend::dellemc_unity::san_password: 'password'
+cinder::backend::dellemc_unity::storage_protocol: 'iSCSI'
+cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file: '/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml'
+cinder::backend::dellemc_xtremio::san_ip: '127.0.0.2'
+cinder::backend::dellemc_xtremio::san_login: 'admin'
+cinder::backend::dellemc_xtremio::san_password: 'password'
+cinder::backend::dellemc_xtremio::xtremio_cluster_name: 'xtremio'
+cinder::backend::dellsc_iscsi::san_ip: '172.23.8.101'
+cinder::backend::dellsc_iscsi::san_login: 'admin'
+cinder::backend::dellsc_iscsi::san_password: 'password'
+cinder::backend::dellsc_iscsi::dell_sc_ssn: '64720'
+cinder::backend::dellemc_vxflexos::san_login: 'admin'
+cinder::backend::dellemc_vxflexos::san_password: 'password'
+cinder::backend::dellemc_vxflexos::san_ip: '127.0.0.2'
+cinder::backend::dellemc_vxflexos::vxflexos_storage_pools: 'domain1:pool1,domain2:pool2'
+cinder::backend::emc_vnx::san_ip: '127.0.0.2'
+cinder::backend::emc_vnx::san_password: 'password'
+cinder::backend::netapp::netapp_login: 'netapp'
+cinder::backend::netapp::netapp_password: 'password'
+cinder::backend::netapp::netapp_server_hostname: '127.0.0.2'
+cinder::backend::pure::san_ip: '127.0.0.2'
+cinder::backend::pure::pure_api_token: 'abc123def456ghi789'
+cinder::backend::scaleio::sio_login: 'admin'
+cinder::backend::scaleio::sio_password: 'password'
+cinder::backend::scaleio::sio_server_hostname: 'scaleio.example.com'
+cinder::backend::scaleio::sio_protection_domain_id: 'domainid1'
+cinder::backend::scaleio::sio_protection_domain_name: 'domain1'
+cinder::backend::scaleio::sio_storage_pool_id: 'poolid1'
+cinder::backend::scaleio::sio_storage_pool_name: 'pool1'
+cinder::backend::scaleio::sio_storage_pools: 'domain1:pool1,domain2:pool2'
 # designate related items
 designate_central_short_bootstrap_node_name: node
 designate::keystone::authtoken::password: 'password'