summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-07-28 08:15:21 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-07-28 08:15:21 +1000
commit871e6fd58223cad241bcc14f165b3ab1e6e257e6 (patch)
tree58bdbcb8f65bbb1bd4368a2cdba911fea57d6d89
parentcb64477d505715d7dd66cd502ed27662b9378248 (diff)
downloadpuppet-871e6fd58223cad241bcc14f165b3ab1e6e257e6.tar.gz
puppet-871e6fd58223cad241bcc14f165b3ab1e6e257e6.tar.xz
puppet-871e6fd58223cad241bcc14f165b3ab1e6e257e6.zip
Fixed #4368 - Updated clean stored configs ext script for new config sections
-rw-r--r--ext/puppetstoredconfigclean.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index 34dd72f5d..9b7b0c8a7 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -19,11 +19,11 @@ end
opts = GetoptLong.new(
-
+
[ "--config", "-c", GetoptLong::REQUIRED_ARGUMENT ],
[ "--help", "-h", GetoptLong::NO_ARGUMENT ],
[ "--usage", "-u", GetoptLong::NO_ARGUMENT ],
-
+
[ "--version", "-v", GetoptLong::NO_ARGUMENT ]
)
@@ -54,7 +54,7 @@ printusage(1) unless ARGV.size > 0
require 'puppet/rails'
Puppet[:config] = config
Puppet.parse_config
-pm_conf = Puppet.settings.instance_variable_get(:@values)[:puppetmasterd]
+pm_conf = Puppet.settings.instance_variable_get(:@values)[:master]
adapter = pm_conf[:dbadapter]
args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}