diff -r f239c8c5bb94 -r cf0f23803a53 dev/provisioning/modules/elasticsearch/manifests/service/systemd.pp --- a/dev/provisioning/modules/elasticsearch/manifests/service/systemd.pp Tue Nov 08 18:23:01 2016 +0100 +++ b/dev/provisioning/modules/elasticsearch/manifests/service/systemd.pp Wed Nov 09 15:05:41 2016 +0100 @@ -103,12 +103,12 @@ $service_enable = false } - $notify_service = $elasticsearch::restart_on_change ? { + $notify_service = $elasticsearch::restart_config_change ? { true => [ Exec["systemd_reload_${name}"], Service["elasticsearch-instance-${name}"] ], false => Exec["systemd_reload_${name}"] } - if ( $status != 'unmanaged' and $ensure == 'present' ) { + if ( $ensure == 'present' ) { # defaults file content. Either from a hash or file if ($init_defaults_file != undef) { @@ -116,7 +116,7 @@ ensure => $ensure, source => $init_defaults_file, owner => 'root', - group => 'root', + group => '0', mode => '0644', before => Service["elasticsearch-instance-${name}"], notify => $notify_service, @@ -163,7 +163,7 @@ $memlock = undef } - file { "/lib/systemd/system/elasticsearch-${name}.service": + file { "${elasticsearch::params::systemd_service_path}/elasticsearch-${name}.service": ensure => $ensure, content => template($init_template), before => Service["elasticsearch-instance-${name}"], @@ -174,9 +174,9 @@ $service_require = Exec["systemd_reload_${name}"] - } elsif($status != 'unmanaged') { + } else { - file { "/lib/systemd/system/elasticsearch-${name}.service": + file { "${elasticsearch::params::systemd_service_path}/elasticsearch-${name}.service": ensure => 'absent', subscribe => Service["elasticsearch-instance-${name}"], notify => Exec["systemd_reload_${name}"], @@ -197,20 +197,16 @@ refreshonly => true, } - if ($status != 'unmanaged') { - - # action - service { "elasticsearch-instance-${name}": - ensure => $service_ensure, - enable => $service_enable, - name => "elasticsearch-${name}.service", - hasstatus => $elasticsearch::params::service_hasstatus, - hasrestart => $elasticsearch::params::service_hasrestart, - pattern => $elasticsearch::params::service_pattern, - provider => 'systemd', - require => $service_require, - } - + # action + service { "elasticsearch-instance-${name}": + ensure => $service_ensure, + enable => $service_enable, + name => "elasticsearch-${name}.service", + hasstatus => $elasticsearch::params::service_hasstatus, + hasrestart => $elasticsearch::params::service_hasrestart, + pattern => $elasticsearch::params::service_pattern, + provider => 'systemd', + require => $service_require, } }