Fix private variable usage for '_plugindir'

Author: Gavin Williams

manifests/config.pp

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

manifests/init.pp

@@ -449,9 +449,9 @@
 
   # Set the plugin path variable for use later in the module.
   if $plugindir == undef {
-    $_plugindir = "${homedir}/plugins"
+    $real_plugindir = "${homedir}/plugins"
   } else {
-    $_plugindir = $plugindir
+    $real_plugindir = $plugindir
   }
 
   # Should we restart Elasticsearch on config change?

manifests/package.pp

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

manifests/plugin.pp

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