Renaming 'configuration' to 'catalog', fixing #954.

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
diff --git a/bin/ralsh b/bin/ralsh
index 58c96c930..e43177d35 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -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