Merge branch 'master' of https://github.com/elastic/puppet-elasticsearch

CHANGELOG.md

@@ -56,6 +56,8 @@ Remember to restart any puppetmaster servers to clear provider caches and pull i
 * Support management of the global jvm.options configuration file.
 * Restricted permissions to the elasticsearch.yml file.
 * X-Pack support added.
+* X-Pack support added.
+* Restricted permissions to the elasticsearch.yml file.
 * Deprecation log configuration support added.
 * Synced systemd service file with upstream.
 
@@ -71,6 +73,8 @@ Remember to restart any puppetmaster servers to clear provider caches and pull i
 * Calls to `elasticsearch -version` in elasticsearch::plugin code replaced with native Puppet code to resolve Elasticsearch package version. Should improve resiliency when managing plugins.
 * Removed deprecated ceritsc/yum module in favor of puppet/yum.
 * Shield and X-Pack configuration files are stored in /etc/elasticsearch instead of /usr/share/elasticsearch.
+* Shield and X-Pack configuration files are stored in /etc/elasticsearch instead of /usr/share/elasticsearch.
+* Removed deprecated ceritsc/yum module in favor of puppet/yum.
 
 #### Testing changes
 
@@ -126,6 +130,7 @@ This release also adds the ability to define logging rolling file settings and a
 * Recursively create the logdir for elasticsearch when creating multiple instances
 * Files and directories with root ownership now specify UID/GID 0 instead to improve compatability with *BSDs.
 * Elasticsearch Debian init file changed to avoid throwing errors when DATA_DIR, WORK_DIR and/or LOG_DIR were an empty variable.
+* Fixed a broken File dependency when a plugin was set to absent and ::elasticsearch set to present.
 * Fixed issue when using the `proxy` parameter on plugins in Elasticsearch 2.x.
 
 #### Changes

manifests/config.pp

@@ -87,7 +87,6 @@
       file { $elasticsearch::params::pid_dir:
         ensure  => 'directory',
         group   => undef,
-        mode    => '0755',
         owner   => $elasticsearch::elasticsearch_user,
         mode    => '0755',
         recurse => true,

spec/integration/integration001.rb

@@ -166,7 +166,8 @@ class { 'elasticsearch':
               'network.host' => '0.0.0.0',
             },
             java_install => true,
-            package_url => '#{test_settings['snapshot_package']}'
+            package_url => '#{test_settings['snapshot_package']}',
+            restart_on_change => true,
           }
 
           elasticsearch::instance { 'es-01':