diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-11 15:35:36 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-11 15:35:36 -0600 |
| commit | cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5 (patch) | |
| tree | b4284addea69adf9d19028ff1bab94035b1c1827 /bin/puppet | |
| parent | 7ac3bd79621f6c66cd3b5b7041aeba83c27c3602 (diff) | |
| download | puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.tar.gz puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.tar.xz puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.zip | |
Renaming 'configuration' to 'catalog', fixing #954.
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 10 |
1 files changed, 5 insertions, 5 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 |