Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Use Puppet[:clientyamldir] as suggested by tmz.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2010-05-12 15:13:51 -04:00
parent bb8f5554b2
commit 035ef8f46a
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/puppetsearch/puppetsearch.rb
View file

@ -40,10 +40,15 @@ if options[:yamlfile].nil?
fqdn = Facter.value(:fqdn)
if fqdn.nil?
abort "Error: Could not get FQDN"
abort "Error: Could not determine FQDN"
end
options[:yamlfile] = "/var/lib/puppet/client_yaml/catalog/#{fqdn}.yaml"
client_yaml = Puppet[:clientyamldir]
if client_yaml.nil?
abort "Could not determine client YAML directory."
end
options[:yamlfile] = "#{client_yaml}/catalog/#{fqdn}.yaml"
end
catalog = YAML::load_file(options[:yamlfile])