Fix stomping of certfile

[dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / yamlinfo.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index 8f705c8d813730d31dd1185ee824b7f4f1e47d82..f53014dee3a22c2f7dcaeda9fd746fa9be329605 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -28,8 +28,7 @@ module Puppet::Parser::Functions
       results['smarthost']      = ''
       results['heavy_exim']     = ''
       results['smarthost_port'] = 587
-      results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
-    
+
       if yaml['host_settings'].kind_of?(Hash)
         yaml['host_settings'].each_pair do |property, values|
           if values.kind_of?(Hash)
@@ -43,7 +42,6 @@ module Puppet::Parser::Functions
     }
 
     require 'yaml'
-    $KCODE = 'utf-8'
 
     yaml = YAML.load_file(yamlfile)
     ret = {}