diff options
| -rw-r--r-- | lib/puppet/indirector/catalog/yaml.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/node/catalog.rb | 16 |
2 files changed, 0 insertions, 18 deletions
diff --git a/lib/puppet/indirector/catalog/yaml.rb b/lib/puppet/indirector/catalog/yaml.rb index 00241d852..6a8d1765c 100644 --- a/lib/puppet/indirector/catalog/yaml.rb +++ b/lib/puppet/indirector/catalog/yaml.rb @@ -10,8 +10,6 @@ class Puppet::Node::Catalog::Yaml < Puppet::Indirector::Yaml # objects. This is hackish, but eh. def from_yaml(text) if config = YAML.load(text) - # We can't yaml-dump classes. - #config.edgelist_class = Puppet::Relationship return config end end diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index 76fc8f940..13e47a320 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -27,10 +27,6 @@ class Puppet::Node::Catalog < Puppet::SimpleGraph # How we should extract the catalog for sending to the client. attr_reader :extraction_format - # We need the ability to set this externally, so we can yaml-dump the - # catalog. - attr_accessor :edgelist_class - # Whether this is a host catalog, which behaves very differently. # In particular, reports are sent, graphs are made, and state is # stored in the state database. If this is set incorrectly, then you often @@ -408,18 +404,6 @@ class Puppet::Node::Catalog < Puppet::SimpleGraph super end - # LAK:NOTE We cannot yaml-dump the class in the edgelist_class, because classes cannot be - # dumped by default, nor does yaml-dumping # the edge-labels work at this point (I don't - # know why). - # Neither of these matters right now, but I suppose it could at some point. - # We also have to have the vertex_dict dumped after the resource table, because yaml can't - # seem to handle the output of yaml-dumping the vertex_dict. - def to_yaml_properties - props = instance_variables.reject { |v| %w{@edgelist_class @edge_labels @vertex_dict}.include?(v) } - props << "@vertex_dict" - props - end - private def cleanup |