Merge pull request #209 from tampakrap/stringify_facts

Move stringify_facts to config.pp ([main] section in puppet.conf) only

Author: danieldreier

manifests/agent.pp

@@ -93,7 +93,6 @@
   $usecacheonfailure = true,
   $method            = $puppet::params::default_method,
   $manage_package    = true,
-  $stringify_facts   = false,
   $package           = $puppet::params::agent_package,
 ) inherits puppet::params {
 
@@ -104,7 +103,6 @@
   validate_bool($splay)
   validate_bool($usecacheonfailure)
   validate_bool($manage_package)
-  validate_bool($stringify_facts)
 
   include puppet
 

manifests/agent/config.pp

@@ -76,9 +76,4 @@
     setting => 'usecacheonfailure',
     value   => $puppet::agent::usecacheonfailure,
   }
-
-  ini_setting { 'stringify_facts_agent':
-    setting => 'stringify_facts',
-    value   => $puppet::agent::stringify_facts;
-  }
 }

manifests/config.pp

@@ -46,4 +46,9 @@
     setting => 'srv_domain',
     value   => $puppet::srv_domain,
   }
+
+  ini_setting { 'stringify_facts':
+    setting => 'stringify_facts',
+    value   => $puppet::stringify_facts,
+  }
 }

manifests/init.pp

@@ -61,9 +61,11 @@
   $conf            = $puppet::params::puppet_conf,
   $use_srv_records = false,
   $srv_domain      = $::domain,
+  $stringify_facts = false
 ) inherits puppet::params {
 
   validate_bool($use_srv_records)
+  validate_bool($stringify_facts)
 
   include puppet::config
 

manifests/server.pp

@@ -158,7 +158,6 @@
   $serverssl_protos  = undef,
   $servertype        = 'unicorn',
   $storeconfigs      = undef,
-  $stringify_facts   = false,
   $package           = $puppet::params::master_package,
   $tagmail           = {}
 ) inherits puppet::params {

manifests/server/config.pp

@@ -96,11 +96,6 @@
     'group':
       setting => 'group',
       value   => $puppet::group;
-
-    'stringify_facts_master':
-      setting => 'stringify_facts',
-      section => 'main',
-      value   => $puppet::server::stringify_facts;
   }
 
   ini_setting { 'ca':