From 3a28e19a838596b38e705441ad70d3eaec659734 Mon Sep 17 00:00:00 2001 From: Luca Belluccini Date: Sat, 13 Oct 2018 15:32:54 +0200 Subject: [PATCH] update CHANGELOG and CONTRIBUTORS --- CHANGELOG.md | 1 + CONTRIBUTORS | 1 + manifests/instance.pp | 49 +++++++++++++++++++++---------------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6221e1c2..9e549ff9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## x.x.x (Month Day, Year) #### Fixes +* Update of the roles, roles mappings and users will not trigger service restart (if enabled). #### Features diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 483369729..3969c9d52 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -31,3 +31,4 @@ Rhommel Lamas (rhoml) Jose Luis Ledesma (sp-joseluis-ledesma) Matthias Baur (baurmatt) Gavin Williams (fatmcgav) +Luca Belluccini (lucabelluccini) diff --git a/manifests/instance.pp b/manifests/instance.pp index 896f1f2a9..e6ecbdfc3 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -383,39 +383,38 @@ notify => $notify_service, } file { "${configdir}/users_roles": - ensure => 'file', - source => "${elasticsearch::configdir}/users_roles", - purge => $elasticsearch::purge_configdir, - force => $elasticsearch::purge_configdir, - require => File[$configdir], - before => Elasticsearch::Service[$name], + ensure => 'file', + source => "${elasticsearch::configdir}/users_roles", + purge => $elasticsearch::purge_configdir, + force => $elasticsearch::purge_configdir, + require => File[$configdir], + before => Elasticsearch::Service[$name], } file { "${configdir}/roles.yml": - ensure => 'file', - source => "${elasticsearch::configdir}/roles.yml", - purge => $elasticsearch::purge_configdir, - force => $elasticsearch::purge_configdir, - require => File[$configdir], - before => Elasticsearch::Service[$name], + ensure => 'file', + source => "${elasticsearch::configdir}/roles.yml", + purge => $elasticsearch::purge_configdir, + force => $elasticsearch::purge_configdir, + require => File[$configdir], + before => Elasticsearch::Service[$name], } file { "${configdir}/role_mapping.yml": - ensure => 'file', - source => "${elasticsearch::configdir}/role_mapping.yml", - purge => $elasticsearch::purge_configdir, - force => $elasticsearch::purge_configdir, - require => File[$configdir], - before => Elasticsearch::Service[$name], + ensure => 'file', + source => "${elasticsearch::configdir}/role_mapping.yml", + purge => $elasticsearch::purge_configdir, + force => $elasticsearch::purge_configdir, + require => File[$configdir], + before => Elasticsearch::Service[$name], } file { "${configdir}/users": - ensure => 'file', - source => "${elasticsearch::configdir}/users", - purge => $elasticsearch::purge_configdir, - force => $elasticsearch::purge_configdir, - require => File[$configdir], - before => Elasticsearch::Service[$name], + ensure => 'file', + source => "${elasticsearch::configdir}/users", + purge => $elasticsearch::purge_configdir, + force => $elasticsearch::purge_configdir, + require => File[$configdir], + before => Elasticsearch::Service[$name], } - # Do _not_ copy in instance directories. This avoids a) recursing # indefinitely by copying our own instance directory and b) copying in any # other potential instance directories.