Merge pull request echocat#113 from jplindquist/master

Make server and sentinel exec names unique echocat#111

Author: dwerder

manifests/sentinel.pp

@@ -110,7 +110,7 @@
   # startup script
   if ($::osfamily == 'RedHat' and versioncmp($::operatingsystemmajrelease, '7') >=0 and $::operatingsystem != 'Amazon') {
     $service_file = "/usr/lib/systemd/system/redis-sentinel_${sentinel_name}.service"
-    exec { "systemd_service_${sentinel_name}_preset":
+    exec { "systemd_service_sentinel_${sentinel_name}_preset":
       command     => "/bin/systemctl preset redis-sentinel_${sentinel_name}.service",
       notify      => Service["redis-sentinel_${sentinel_name}"],
       refreshonly => true,
@@ -121,7 +121,7 @@
       mode    => '0755',
       content => template('redis/systemd/sentinel.service.erb'),
       require => File[$conf_file],
-      notify  => Exec["systemd_service_${sentinel_name}_preset"],
+      notify  => Exec["systemd_service_sentinel_${sentinel_name}_preset"],
     }
   } else {
     $service_file = "/etc/init.d/redis-sentinel_${sentinel_name}"

manifests/server.pp

@@ -216,7 +216,7 @@
   }
 
   if $has_systemd {
-    exec { "systemd_service_${redis_name}_preset":
+    exec { "systemd_service_server_${redis_name}_preset":
       command     => "/bin/systemctl preset redis-server_${redis_name}.service",
       notify      => Service["redis-server_${redis_name}"],
       refreshonly => true,
@@ -230,7 +230,7 @@
         File[$conf_file],
         File["${redis_dir}/redis_${redis_name}"]
       ],
-      notify  => Exec["systemd_service_${redis_name}_preset"],
+      notify  => Exec["systemd_service_server_${redis_name}_preset"],
     }
   } else {
     file { $service_file: