Add Debian/Ubuntu specific packaging changes.

data/tree/Debian.yaml

@@ -1,4 +1,6 @@
 # gluster/data/tree/Debian.yaml
 ---
-
+gluster::params::package_glusterfs: 'glusterfs-client'
+gluster::params::package_glusterfs_api: ''      # doesn't exist
+gluster::params::package_glusterfs_fuse: ''     # doesn't exist
 # vim: ts=8

manifests/api.pp

@@ -26,15 +26,18 @@
 		default => "gluster-${version}",
 	}
 
-	package { "${::gluster::params::package_glusterfs_api}":
-		ensure => "${version}" ? {
-			'' => present,
-			default => "${version}",
-		},
-		require => $repo ? {
-			false => undef,
-			default => Gluster::Repo["${rname}"],
-		},
+	# certain packages don't exist on certain operating systems
+	if "${::gluster::params::package_glusterfs_api}" != '' {
+		package { "${::gluster::params::package_glusterfs_api}":
+			ensure => "${version}" ? {
+				'' => present,
+				default => "${version}",
+			},
+			require => $repo ? {
+				false => undef,
+				default => Gluster::Repo["${rname}"],
+			},
+		}
 	}
 }
 

manifests/mount.pp

@@ -142,6 +142,13 @@
 		alias => "${short_name}",	# don't allow duplicates name's
 	}
 
+	$packages = "${::gluster::params::package_glusterfs_fuse}" ? {
+		'' => ["${::gluster::params::package_glusterfs}"],
+		default => [
+			"${::gluster::params::package_glusterfs}",
+			"${::gluster::params::package_glusterfs_fuse}",
+		],
+	}
 	# Mount Options:
 	# * backupvolfile-server=server-name
 	# * fetch-attempts=N (where N is number of attempts)
@@ -163,10 +170,7 @@
 		dump => '0',		# fs_freq: 0 to skip file system dumps
 		pass => '0',		# fs_passno: 0 to skip fsck on boot
 		require => [
-			Package[
-				["${::gluster::params::package_glusterfs}",
-				"${::gluster::params::package_glusterfs_fuse}"]
-			],
+			Package[$packages],
 			File["${long_name}"],		# the mountpoint
 			Exec['gluster-fuse'],	# ensure fuse is loaded!
 		],

manifests/mount/base.pp

@@ -37,13 +37,22 @@
 		ensure_resource('gluster::repo', "${rname}", $params)
 	}
 
-	package { ["${::gluster::params::package_glusterfs}",
-		"${::gluster::params::package_glusterfs_fuse}"]:
+	$packages = "${::gluster::params::package_glusterfs_fuse}" ? {
+		'' => ["${::gluster::params::package_glusterfs}"],
+		default => [
+			"${::gluster::params::package_glusterfs}",
+			"${::gluster::params::package_glusterfs_fuse}",
+		],
+	}
+	package { $packages:
 		ensure => "${version}" ? {
 			'' => present,
 			default => "${version}",
 		},
-		before => Package["${::gluster::params::package_glusterfs_api}"],
+		before => "${::gluster::params::package_glusterfs_api}" ? {
+			'' => undef,
+			default => Package["${::gluster::params::package_glusterfs_api}"],
+		},
 		require => $repo ? {
 			false => undef,
 			default => Gluster::Repo["${rname}"],

manifests/server.pp

@@ -67,7 +67,10 @@
 			'' => present,
 			default => "${version}",
 		},
-		before => Package["${::gluster::params::package_glusterfs_api}"],
+		before => "${::gluster::params::package_glusterfs_api}" ? {
+			'' => undef,
+			default => Package["${::gluster::params::package_glusterfs_api}"],
+		},
 		require => $repo ? {
 			false => undef,
 			default => Gluster::Repo["${rname}"],