Add Debian/Ubuntu specific service naming changes.

This patch also generalizes the service name, so that other operating
systems will also benefit from this patch by dropping in a yaml file.

5 files changed, 23 insertions, 17 deletions

diff --git a/data/tree/Debian.yaml b/data/tree/Debian.yaml
index a6be355..098123c 100644
--- a/data/tree/Debian.yaml
+++ b/data/tree/Debian.yaml
@@ -3,4 +3,7 @@
 gluster::params::package_glusterfs: 'glusterfs-client'
 gluster::params::package_glusterfs_api: ''      # doesn't exist
 gluster::params::package_glusterfs_fuse: ''     # doesn't exist
+gluster::params::service_glusterd: 'glusterfs-server'
+# TODO: the debian family of glusterd needs a reload command in the init file !
+gluster::params::misc_gluster_reload: '/usr/sbin/service glusterfs-server restart'
 # vim: ts=8
diff --git a/manifests/host.pp b/manifests/host.pp
index b28be83..91a0548 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -34,7 +34,7 @@ define gluster::host(
 		fail("The chosen UUID: '${uuid}' is not valid.")
 	}
 
-	Gluster::Host[$name] -> Service['glusterd']	# glusterd requires host
+	Gluster::Host[$name] -> Service["${::gluster::params::service_glusterd}"]	# glusterd requires host
 
 	# if we're on itself
 	if "${fqdn}" == "${name}" {
@@ -124,7 +124,7 @@ define gluster::host(
 				seltype => 'glusterd_var_lib_t',
 				seluser => 'system_u',
 				ensure => present,
-				notify => Service['glusterd'],
+				notify => Service["${::gluster::params::service_glusterd}"],
 				require => File['/var/lib/glusterd/'],
 			}
 
@@ -158,7 +158,7 @@ define gluster::host(
 				notify => [
 					# propagate the notify up
 					File['/var/lib/glusterd/peers/'],
-					Service['glusterd'],	# ensure reload
+					Service["${::gluster::params::service_glusterd}"],	# ensure reload
 				],
 				before => File["/var/lib/glusterd/peers/${valid_uuid}"],
 				alias => "gluster-host-uuid-${name}",
@@ -180,7 +180,7 @@ define gluster::host(
 				notify => [
 					# propagate the notify up
 					File['/var/lib/glusterd/peers/'],
-					Service['glusterd'],	# ensure reload
+					Service["${::gluster::params::service_glusterd}"],	# ensure reload
 				],
 				before => File["/var/lib/glusterd/peers/${valid_uuid}"],
 				require => Exec["gluster-host-uuid-${name}"],
@@ -194,7 +194,7 @@ define gluster::host(
 				notify => [
 					# propagate the notify up
 					File['/var/lib/glusterd/peers/'],
-					Service['glusterd'],	# ensure reload
+					Service["${::gluster::params::service_glusterd}"],	# ensure reload
 				],
 				before => File["/var/lib/glusterd/peers/${valid_uuid}"],
 				require => Exec["gluster-host-state-${name}"],
@@ -212,7 +212,7 @@ define gluster::host(
 				notify => [
 					# propagate the notify up
 					File['/var/lib/glusterd/peers/'],
-					Service['glusterd'],	# ensure reload
+					Service["${::gluster::params::service_glusterd}"],	# ensure reload
 				],
 			}
 		}
@@ -377,7 +377,7 @@ define gluster::host(
 		# them but this isn't a huge issue at the moment...
 		Shorewall::Rule <<| tag == 'gluster_firewall_management' |>> {
 			source => "${zone}",	# use our source zone
-			before => Service['glusterd'],
+			before => Service["${::gluster::params::service_glusterd}"],
 		}
 	}
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index fc71cec..de3afd2 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -50,6 +50,9 @@ class gluster::params(
 
 	$program_fping = '/usr/sbin/fping',
 
+	# services...
+	$service_glusterd = 'glusterd',
+
 	# misc...
 	$misc_gluster_reload = '/sbin/service glusterd reload',
 
diff --git a/manifests/server.pp b/manifests/server.pp
index 2b15d5e..d065091 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -92,7 +92,7 @@ class gluster::server(
 		owner => root,
 		group => root,
 		mode => 644,
-		#notify => Service['glusterd'],	# TODO: ???
+		#notify => Service["${::gluster::params::service_glusterd}"],	# TODO: ???
 		require => Package["${::gluster::params::package_glusterfs_server}"],
 	}
 
@@ -122,7 +122,7 @@ class gluster::server(
 		owner => root,
 		group => root,
 		mode => 644,
-		#notify => Service['glusterd'],	# TODO: eventually...
+		#notify => Service["${::gluster::params::service_glusterd}"],	# TODO: eventually...
 		require => File['/etc/glusterfs/glusterd.vol'],
 	}
 
@@ -134,7 +134,7 @@ class gluster::server(
 		owner => root,
 		group => root,
 		mode => 644,
-		notify => Service['glusterd'],
+		notify => Service["${::gluster::params::service_glusterd}"],
 		require => File['/var/lib/glusterd/'],
 	}
 
@@ -164,7 +164,7 @@ class gluster::server(
 		#	ACCEPT    ${src}    $FW    tcp    24009:${endport}
 		#	",
 		#	comment => 'Allow 24000s for gluster',
-		#	before => Service['glusterd'],
+		#	before => Service["${::gluster::params::service_glusterd}"],
 		#}
 
 		#if $nfs {					# FIXME: TODO
@@ -175,7 +175,7 @@ class gluster::server(
 	}
 
 	# start service only after the firewall is opened and hosts are defined
-	service { 'glusterd':
+	service { "${::gluster::params::service_glusterd}":
 		enable => true,		# start on boot
 		ensure => running,	# ensure it stays running
 		hasstatus => false,	# FIXME: BUG: https://bugzilla.redhat.com/show_bug.cgi?id=836007
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 3a15fae..b203482 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -212,14 +212,14 @@ define gluster::volume(
 
 	$require = $ping ? {
 		false => [
-			Service['glusterd'],
+			Service["${::gluster::params::service_glusterd}"],
 			File["${vardir}/volume/create-${name}.sh"],
 			File["${vardir}/xml.py"],	# status check
 			Gluster::Brick[$valid_bricks],
 			Exec["gluster-volume-stuck-${name}"],
 		],
 		default => [
-			Service['glusterd'],
+			Service["${::gluster::params::service_glusterd}"],
 			File["${vardir}/volume/create-${name}.sh"],
 			Package["${::gluster::params::package_fping}"],
 			File["${vardir}/xml.py"],	# status check
@@ -239,7 +239,7 @@ define gluster::volume(
 			default => Common::Again::Delta['gluster-exec-again'],
 		},
 		require => [
-			Service['glusterd'],
+			Service["${::gluster::params::service_glusterd}"],
 			File["${vardir}/xml.py"],	# stuck check
 			Gluster::Brick[$valid_bricks],
 		],
@@ -367,14 +367,14 @@ define gluster::volume(
 		#Shorewall::Rule <<| tag == 'gluster_firewall_volume' and comment != "${fqdn}" |>> {
 		Shorewall::Rule <<| tag == 'gluster_firewall_volume' |>> {
 			source => "${zone}",	# use our source zone
-			before => Service['glusterd'],
+			before => Service["${::gluster::params::service_glusterd}"],
 		}
 
 		Gluster::Rulewrapper <<| tag == 'gluster_firewall_volume' and match == "${name}" |>> {
 		#Shorewall::Rule <<| tag == 'gluster_firewall_volume' and match == "${name}" |>> {
 			source => "${zone}",	# use our source zone
 			port => "${port}",	# comma separated string or list
-			before => Service['glusterd'],
+			before => Service["${::gluster::params::service_glusterd}"],
 		}
 	}