summaryrefslogtreecommitdiff
path: root/lib/puppet/util/trocla_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/util/trocla_helper.rb')
-rw-r--r--lib/puppet/util/trocla_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/util/trocla_helper.rb b/lib/puppet/util/trocla_helper.rb
index ea4edee..9a41c0e 100644
--- a/lib/puppet/util/trocla_helper.rb
+++ b/lib/puppet/util/trocla_helper.rb
@@ -16,7 +16,11 @@ module Puppet::Util::TroclaHelper
key = args[0] || raise(Puppet::ParseError, "You need to pass at least a key as an argument!")
format = args[1] || 'plain'
options = args[2] || {}
-
+ if options.is_a?(String)
+ require 'yaml'
+ options = YAML.load(options)
+ end
+
configfile = File.join(File.dirname(Puppet.settings[:config]), "troclarc.yaml")
raise(Puppet::ParseError, "Trocla config file #{configfile} not readable") unless File.exist?(configfile)