Merge branch 'pr/1023'

Resolves #1023

Author: tylerjl

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 #### Fixes
 * Fix "Could not autoload" errors in some custom types/providers.
+* Resolved an issue arising from the use of `hiera()` in Hiera yaml data files.
 
 ## 6.3.4 (August 7, 2019)
 

data/common.yaml

@@ -40,7 +40,7 @@ elasticsearch::package_provider: package
 elasticsearch::package_url: ~
 elasticsearch::pid_dir: /var/run/elasticsearch
 elasticsearch::pipelines: {}
-elasticsearch::plugindir: "%{hiera('elasticsearch::homedir')}/plugins"
+elasticsearch::plugindir: ~
 elasticsearch::plugins: {}
 elasticsearch::proxy_url: ~
 elasticsearch::purge_configdir: false

manifests/config.pp

@@ -36,7 +36,7 @@
         group  => $elasticsearch::elasticsearch_group,
         owner  => $elasticsearch::elasticsearch_user,
         mode   => '0750';
-      $elasticsearch::plugindir:
+      $elasticsearch::_plugindir:
         ensure => 'directory',
         group  => $elasticsearch::elasticsearch_group,
         owner  => $elasticsearch::elasticsearch_user,
@@ -160,7 +160,7 @@
 
   } elsif ( $elasticsearch::ensure == 'absent' ) {
 
-    file { $elasticsearch::plugindir:
+    file { $elasticsearch::_plugindir:
       ensure => 'absent',
       force  => true,
       backup => false,

manifests/init.pp

@@ -346,7 +346,7 @@
   Optional[String]                                $package_url,
   Optional[Stdlib::Absolutepath]                  $pid_dir,
   Hash                                            $pipelines,
-  Stdlib::Absolutepath                            $plugindir,
+  Optional[Stdlib::Absolutepath]                  $plugindir,
   Hash                                            $plugins,
   Optional[Stdlib::HTTPUrl]                       $proxy_url,
   Boolean                                         $purge_configdir,
@@ -412,6 +412,13 @@
     default => $package_name,
   }
 
+  # Set the plugin path variable for use later in the module.
+  if $plugindir == undef {
+    $_plugindir = "${homedir}/plugins"
+  } else {
+    $_plugindir = $plugindir
+  }
+
   #### Manage actions
 
   contain elasticsearch::package

manifests/package.pp

@@ -182,7 +182,7 @@
 
     exec { 'remove_plugin_dir':
       refreshonly => true,
-      command     => "rm -rf ${elasticsearch::plugindir}",
+      command     => "rm -rf ${elasticsearch::_plugindir}",
     }
 
 

manifests/plugin.pp

@@ -85,7 +85,7 @@
     }
     'absent': {
       $_file_ensure = $ensure
-      $_file_before = File[$elasticsearch::plugindir]
+      $_file_before = File[$elasticsearch::_plugindir]
     }
     default: { }
   }
@@ -134,10 +134,10 @@
     source                     => $file_source,
     url                        => $url,
     proxy                      => $_proxy,
-    plugin_dir                 => $::elasticsearch::plugindir,
+    plugin_dir                 => $::elasticsearch::_plugindir,
     plugin_path                => $module_dir,
   }
-  -> file { "${elasticsearch::plugindir}/${_module_dir}":
+  -> file { "${elasticsearch::_plugindir}/${_module_dir}":
     ensure  => $_file_ensure,
     mode    => 'o+Xr',
     recurse => true,