Merge "Fix wrong source to define volume_backend_name"

manifests/backend/dellemc_powerflex.pp

@@ -140,9 +140,9 @@ define cinder::backend::dellemc_powerflex(
     "${name}/driver_ssl_cert_path":                     value => $driver_ssl_cert_path;
   }
   if $manage_volume_type {
-    cinder_type { $name:
+    cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => ["volume_backend_name=${name}"],
+      properties => ["volume_backend_name=${volume_backend_name}"],
     }
   }
 

manifests/backend/netapp.pp

@@ -241,9 +241,9 @@ and will be removed in a future release.")
   }
 
   if $manage_volume_type {
-    cinder_type { $name:
+    cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => ["volume_backend_name=${name}"],
+      properties => ["volume_backend_name=${volume_backend_name}"],
     }
   }
 

releasenotes/notes/fix-volume-type-name-0e39f0e2f3e44264.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    The following defined resource types now create volume types according to
+    the ``volume_backend_name`` parameter, instead of resource names.
+
+    - ``cinder::backend::dellemc_powerflex``
+    - ``cinder::backend::netapp``

spec/defines/cinder_backend_gpfs_spec.rb

@@ -44,8 +44,8 @@ describe 'cinder::backend::gpfs' do
       default_params.merge(params)
     end
 
-    it { is_expected.to contain_cinder_config('gpfs/volume_driver').with(
-      :value => 'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
+    it { is_expected.to contain_cinder_config('gpfs/volume_driver').with_value(
+      'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
     )}
 
     it {

spec/defines/cinder_backend_netapp_spec.rb

@@ -71,9 +71,9 @@ describe 'cinder::backend::netapp' do
         params.merge!( :manage_volume_type => true )
       end
 
-      it { is_expected.to contain_cinder_type('netapp').with(
+      it { is_expected.to contain_cinder_type('netapp-cdot-nfs').with(
         :ensure     => 'present',
-        :properties => ['volume_backend_name=netapp']
+        :properties => ['volume_backend_name=netapp-cdot-nfs']
       )}
     end