diff options
-rw-r--r-- | lib/puppet/util/trocla_helper.rb | 4 | ||||
-rw-r--r-- | manifests/config.pp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/util/trocla_helper.rb b/lib/puppet/util/trocla_helper.rb index 8187d08..ea4edee 100644 --- a/lib/puppet/util/trocla_helper.rb +++ b/lib/puppet/util/trocla_helper.rb @@ -17,7 +17,7 @@ module Puppet::Util::TroclaHelper format = args[1] || 'plain' options = args[2] || {} - configfile = File.join(File.dirname(Puppet.settings[:config]), "trocla.yaml") + configfile = File.join(File.dirname(Puppet.settings[:config]), "troclarc.yaml") raise(Puppet::ParseError, "Trocla config file #{configfile} not readable") unless File.exist?(configfile) raise(Puppet::ParseError, "You need rubygems to use Trocla") unless Puppet.features.rubygems? @@ -28,4 +28,4 @@ module Puppet::Util::TroclaHelper has_options ? Trocla.new(configfile).send(trocla_func, key, format, options) : Trocla.new(configfile).send(trocla_func, key, format) end module_function :trocla -end
\ No newline at end of file +end diff --git a/manifests/config.pp b/manifests/config.pp index eb8a8ed..9ce8730 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -8,12 +8,12 @@ class trocla::config($ruby='system') { # deploy default config file and link it for trocla cli lookup file{ - "${settings::confdir}/trocla.yaml": + "${settings::confdir}/troclarc.yaml": content => "---\nadapter_options:\n :path: ${settings::confdir}/trocla_data.yaml\n", owner => root, group => puppet, mode => 0640; - '/etc/trocla.yaml': + '/etc/troclarc.yaml': ensure => link, - target => "${settings::confdir}/trocla.yaml"; + target => "${settings::confdir}/troclarc.yaml"; "${settings::confdir}/trocla_data.yaml": ensure => present, owner => puppet, group => 0, mode => 0600; |