diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppet | 10 | ||||
| -rwxr-xr-x | bin/ralsh | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bin/puppet b/bin/puppet index 409c23259..13e99e2a6 100755 --- a/bin/puppet +++ b/bin/puppet @@ -195,14 +195,14 @@ if options[:loadclasses] end begin - # Compile our configuration - config = Puppet::Node::Configuration.find(node) + # Compile our catalog + catalog = Puppet::Node::Catalog.find(node) - # Translate it to a RAL configuration - config = config.to_ral + # Translate it to a RAL catalog + catalog = catalog.to_ral # And apply it - config.apply + catalog.apply rescue => detail if Puppet[:trace] puts detail.backtrace @@ -228,10 +228,10 @@ else params.each do |param, value| obj[param] = value end - config = Puppet::Node::Configuration.new - config.add_resource obj + catalog = Puppet::Node::Catalog.new + catalog.add_resource obj begin - config.apply + catalog.apply rescue => detail if Puppet[:trace] puts detail.backtrace |
