Fix nfs client package name in Ubuntu/Debian

nfs-utils is specific to CentOS/RHEL and in Ubuntu/Debian nfs-common
should be used instead.

Conflicts:
	manifests/backend/flashblade.pp

Resolved conflict caused by support for the Pure Storage flashBlade
driver which was introduced during the Xena cycle.

Closes-Bug: #1931711
Change-Id: I89f7da9255b307fe80750f01c4508d52ac5b1904
(cherry picked from commit 5e92666e08)

manifests/backend/dellemc_isilon.pp

@@ -68,6 +68,7 @@ define manila::backend::dellemc_isilon (
 ) {
 
   include manila::deps
+  include manila::params
 
   validate_legacy(String, 'validate_string', $emc_nas_password)
 
@@ -86,7 +87,8 @@ define manila::backend::dellemc_isilon (
     "${share_backend_name}/emc_nas_server_secure":        value => $emc_nas_server_secure;
   }
 
-  ensure_resource('package','nfs-utils',{
+  ensure_packages('nfs-client', {
+    name   => $::manila::params::nfs_client_package_name,
     ensure => $package_ensure,
     tag    => 'manila-support-package',
   })

manifests/backend/dellemc_unity.pp

@@ -93,6 +93,7 @@ define manila::backend::dellemc_unity (
 ) {
 
   include manila::deps
+  include manila::params
 
   validate_legacy(String, 'validate_string', $emc_nas_password)
 
@@ -114,7 +115,8 @@ define manila::backend::dellemc_unity (
     "${share_backend_name}/emc_ssl_cert_path":            value => $emc_ssl_cert_path;
   }
 
-  ensure_resource('package','nfs-utils',{
+  ensure_packages('nfs-client', {
+    name   => $::manila::params::nfs_client_package_name,
     ensure => $package_ensure,
     tag    => 'manila-support-package',
   })

manifests/backend/dellemc_vnx.pp

@@ -92,6 +92,7 @@ define manila::backend::dellemc_vnx (
 ) {
 
   include manila::deps
+  include manila::params
 
   validate_legacy(String, 'validate_string', $emc_nas_password)
 
@@ -113,7 +114,8 @@ define manila::backend::dellemc_vnx (
     "${share_backend_name}/emc_ssl_cert_path":            value => $emc_ssl_cert_path;
   }
 
-  ensure_resource('package','nfs-utils',{
+  ensure_packages('nfs-client', {
+    name   => $::manila::params::nfs_client_package_name,
     ensure => $package_ensure,
     tag    => 'manila-support-package',
   })

manifests/backend/hitachi_hnas.pp

@@ -62,6 +62,7 @@ define manila::backend::hitachi_hnas (
 ) {
 
   include manila::deps
+  include manila::params
 
   validate_legacy(String, 'validate_string', $hitachi_hnas_password)
 
@@ -78,8 +79,9 @@ define manila::backend::hitachi_hnas (
     "${share_backend_name}/hitachi_hnas_file_system_name":    value => $hitachi_hnas_file_system_name;
   }
 
-  ensure_resource('package', 'nfs-utils', {
-    'ensure' => $package_ensure,
-    'tag'    => 'manila-support-package',
+  ensure_packages('nfs-client', {
+    name   => $::manila::params::nfs_client_package_name,
+    ensure => $package_ensure,
+    tag    => 'manila-support-package',
   })
 }

manifests/backend/netapp.pp

@@ -131,6 +131,7 @@ define manila::backend::netapp (
 ) {
 
   include manila::deps
+  include manila::params
 
   validate_legacy(String, 'validate_string', $netapp_password)
 
@@ -163,7 +164,8 @@ define manila::backend::netapp (
     "${share_backend_name}/netapp_trace_flags":                   value => $netapp_trace_flags;
   }
 
-  ensure_resource('package','nfs-utils',{
+  ensure_packages('nfs-client', {
+    name   => $::manila::params::nfs_client_package_name,
     ensure => $package_ensure,
     tag    => 'manila-support-package',
   })

manifests/params.pp

@@ -25,6 +25,7 @@ class manila::params {
       $gluster_package_name        = 'glusterfs-common'
       $manila_wsgi_script_path     = '/usr/lib/cgi-bin/manila'
       $manila_wsgi_script_source   = '/usr/bin/manila-wsgi'
+      $nfs_client_package_name     = 'nfs-common'
     }
     'RedHat': {
       $package_name                = 'openstack-manila'
@@ -38,6 +39,7 @@ class manila::params {
       $gluster_package_name        = 'glusterfs'
       $manila_wsgi_script_path     = '/var/www/cgi-bin/manila'
       $manila_wsgi_script_source   = '/usr/bin/manila-wsgi'
+      $nfs_client_package_name     = 'nfs-utils'
     }
     default: {
       fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")

spec/classes/manila_share_hitachi_hnas_spec.rb

@@ -28,17 +28,15 @@ describe 'manila::share::hitachi_hnas' do
     end
   end
 
-
   on_supported_os({
-    :supported_os   => OSDefaults.get_supported_os
-      }).each do |os,facts|
-        context "on #{os}" do
-          let (:facts) do
-            facts.merge(OSDefaults.get_facts({ :osfamily => "#{os}" }))
-          end
-
-          it_configures 'hitachi hnas share driver'
-        end
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts())
       end
 
+      it_configures 'hitachi hnas share driver'
+    end
+  end
 end