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

2 files changed, 5 insertions, 5 deletions

diff --git a/ext/module_puppet b/ext/module_puppet
index 08fc9beb2..6a3f33fe6 100755
--- a/ext/module_puppet
+++ b/ext/module_puppet
@@ -179,7 +179,7 @@ node.classes = classes
 
 begin
     # Compile our configuration
-    config = Puppet::Node::Configuration.find(node)
+    catalog = Puppet::Node::Catalog.find(node)
 rescue => detail
     if Puppet[:trace]
         puts detail.backtrace
@@ -198,10 +198,10 @@ end
 
 begin
     # Translate it to a RAL configuration
-    config = config.to_ral
+    catalog = catalog.to_ral
 
     # And apply it
-    config.apply
+    catalog.apply
 rescue => detail
     Puppet.err detail
     exit(1)
diff --git a/ext/puppet-test b/ext/puppet-test
index b89156caa..362a43996 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -200,7 +200,7 @@ class Suite
     end
 end
 
-Suite.new :configuration, "Configuration handling" do
+Suite.new :catalog, "Catalog handling" do
     def prepare
         $args[:cache] = false
         # Create a config client and pull the config down
@@ -227,7 +227,7 @@ Suite.new :configuration, "Configuration handling" do
         @facts = YAML.dump(@facts)
     end
 
-    newtest :compile, "Compiled configuration" do
+    newtest :compile, "Compiled catalog" do
         @client.driver.getconfig(@facts, "yaml")
     end