diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-07 18:41:51 -0500 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-22 14:39:38 +1000 |
| commit | efe68165b382d6860e83b0bb1d1108f36fa3d2fd (patch) | |
| tree | 0144f344f2d0474f28aa055ecdc8b521249e251c /lib/puppet/indirector | |
| parent | a3b1e8ce9c8ad97ed3bcf65c0554ae34690716fa (diff) | |
Removing unnecessary parser variables when yaml-dumping
Also working around a YAML bug in Ruby.
And fixing tests that were broken in a previous commit
in this rebase but not caught earlier.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/indirector')
| -rw-r--r-- | lib/puppet/indirector/catalog/active_record.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/indirector/catalog/queue.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb index a76606535..ad2dc742b 100644 --- a/lib/puppet/indirector/catalog/active_record.rb +++ b/lib/puppet/indirector/catalog/active_record.rb @@ -1,8 +1,8 @@ require 'puppet/rails/host' require 'puppet/indirector/active_record' -require 'puppet/node/catalog' +require 'puppet/resource/catalog' -class Puppet::Node::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord +class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord use_ar_model Puppet::Rails::Host # If we can find the host, then return a catalog with the host's resources @@ -11,7 +11,7 @@ class Puppet::Node::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord return nil unless request.options[:cache_integration_hack] return nil unless host = ar_model.find_by_name(request.key) - catalog = Puppet::Node::Catalog.new(host.name) + catalog = Puppet::Resource::Catalog.new(host.name) host.resources.each do |resource| catalog.add_resource resource.to_transportable diff --git a/lib/puppet/indirector/catalog/queue.rb b/lib/puppet/indirector/catalog/queue.rb index 85d2f8df5..581382e9e 100644 --- a/lib/puppet/indirector/catalog/queue.rb +++ b/lib/puppet/indirector/catalog/queue.rb @@ -1,5 +1,5 @@ -require 'puppet/node/catalog' +require 'puppet/resource/catalog' require 'puppet/indirector/queue' -class Puppet::Node::Catalog::Queue < Puppet::Indirector::Queue +class Puppet::Resource::Catalog::Queue < Puppet::Indirector::Queue end |