From c370104f7efa6231af05df17ccbb03cbaa2e48ab Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 22 May 2008 00:45:08 -0500 Subject: Fixing the node/catalog so that it can convert from parser catalogs to RAL catalogs. It largely worked previously, except when aliases were set, which require catalogs. This now converts all parser resources to trans_objects then to RAL resources, and sets the catalog in the meantime. This allows aliases to work just fine when converting directly from parser catalogs to RAL catalogs. --- lib/puppet/node/catalog.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/puppet/node') diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index ecda472be..c4d697244 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -483,6 +483,10 @@ class Puppet::Node::Catalog < Puppet::PGraph if resource.is_a?(Puppet::TransObject) resource = resource.dup resource.catalog = result + elsif resource.is_a?(Puppet::Parser::Resource) + resource = resource.to_transobject + p resource + resource.catalog = result end newres = resource.send(convert) -- cgit From 054a811df80f0e4e1a2d53841b490c20c2964487 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 22 May 2008 13:45:58 -0500 Subject: Removing extra debugging --- lib/puppet/node/catalog.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/puppet/node') diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index c4d697244..7d9a83795 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -485,7 +485,6 @@ class Puppet::Node::Catalog < Puppet::PGraph resource.catalog = result elsif resource.is_a?(Puppet::Parser::Resource) resource = resource.to_transobject - p resource resource.catalog = result end -- cgit