Merge pull request #1066 from fatmcgav/fix_intake_failure

Gavin Williams · web-flow · commit 278f0c5dcf07 · 2020-02-06T09:36:08.000Z
Fix intake failure for variable_scope
diff --git a/manifests/package.pp b/manifests/package.pp
@@ -182,7 +182,7 @@
 
     exec { 'remove_plugin_dir':
       refreshonly => true,
-      command     => "rm -rf ${elasticsearch::_plugindir}",
+      command     => "rm -rf ${::elasticsearch::_plugindir}",
     }
 
 
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -137,7 +137,7 @@
     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,

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@`
`182`	`182`
`183`	`183`	`exec { 'remove_plugin_dir':`
`184`	`184`	`refreshonly => true,`
`185`		`- command => "rm -rf ${elasticsearch::_plugindir}",`
	`185`	`+ command => "rm -rf ${::elasticsearch::_plugindir}",`
`186`	`186`	`}`
`187`	`187`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@`
`137`	`137`	`plugin_dir => $::elasticsearch::_plugindir,`
`138`	`138`	`plugin_path => $module_dir,`
`139`	`139`	`}`
`140`		`- -> file { "${elasticsearch::_plugindir}/${_module_dir}":`
	`140`	`+ -> file { "${::elasticsearch::_plugindir}/${_module_dir}":`
`141`	`141`	`ensure => $_file_ensure,`
`142`	`142`	`mode => 'o+Xr',`
`143`	`143`	`recurse => true,`