Please review pull request #208: (maint) Add Hiera lib dir for Linux hosts opened by (djm68)
Description:
Add Hiera lib dir: /opt/puppet-git-repos/hiera/lib to $RUBYLIB.
This is very specific to how we install FOSS Puppet via the test
harness, and will not work if Hiera is installed in a different path.
- Opened: Thu May 10 17:27:54 UTC 2012
- Based on: puppetlabs:master (39cace5dc83c749696bac9036d1538a64ffe66ec)
- Requested merge: djm68:add_hiera_lib_dir (298dfc855ba8305e2a52d920d7b6ecda63cb9f20)
Diff follows:
diff --git a/lib/command.rb b/lib/command.rb
index 51e3c24..22ae433 100644
--- a/lib/command.rb
+++ b/lib/command.rb
@@ -40,7 +40,7 @@ def exec(host, options={})
# [environment] an optional Hash containing key-value pairs to be treated as environment variables that should be
# set for the duration of the puppet command.
def puppet_env_command(host_info, environment = {})
- rubylib = [host_info['pluginlibpath'], host_info['puppetlibdir'], host_info['facterlibdir'],'$RUBYLIB'].compact.join(':')
+ rubylib = [host_info['hieralibdir'], host_info['pluginlibpath'], host_info['puppetlibdir'], host_info['facterlibdir'],'$RUBYLIB'].compact.join(':')
path = [host_info['puppetbindir'], host_info['facterbindir'],'$PATH' ].compact.join(':')
cmd = host_info['platform'] =~ /windows/ ? 'cmd.exe /c' : ''
diff --git a/lib/host/unix.rb b/lib/host/unix.rb
index 8dd3104..550397e 100644
--- a/lib/host/unix.rb
+++ b/lib/host/unix.rb
@@ -25,7 +25,8 @@ class Host < Host
'puppetpath' => '/etc/puppet',
'puppetvardir' => '/var/lib/puppet',
'puppetbin' => '/usr/bin/puppet',
- 'puppetbindir' => '/usr/bin'
+ 'puppetbindir' => '/usr/bin',
+ 'hieralibdir' => '/opt/puppet-git-repos/hiera/lib'
}
def initialize(name, overrides, defaults)
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
