Merge pull request #135 from danieldreier/structured_facts

zachfi · zachfi · commit 49a46717aed0 · 2014-11-26T22:14:09.000-08:00
Enable / manage structured facts
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -50,6 +50,7 @@
   $gentoo_use        = $puppet::params::agent_use,
   $gentoo_keywords   = $puppet::params::agent_keywords,
   $manage_package    = true,
+  $stringify_facts   = $puppet::server::stringify_facts,
 ) inherits puppet::params {
 
   include puppet
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
@@ -105,4 +105,10 @@
     setting => 'usecacheonfailure',
     value   => $puppet::agent::usecacheonfailure,
   }
+
+  ini_setting { 'stringify_facts_agent':
+      setting => 'stringify_facts',
+      section => 'main',
+      value   => $puppet::agent::stringify_facts;
+  }
 }
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -52,6 +52,7 @@
   $serverssl_protos   = undef,
   $servertype         = 'unicorn',
   $storeconfigs       = undef,
+  $stringify_facts    = false,
 ) inherits puppet::params {
 
   $master = true
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -40,6 +40,11 @@
     'group':
       setting => 'group',
       value   => 'puppet';
+
+    'stringify_facts_master':
+      setting => 'stringify_facts',
+      section => 'main',
+      value   => $puppet::server::stringify_facts;
   }
 
   ini_setting { 'ca':

Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,10 @@`
`105`	`105`	`setting => 'usecacheonfailure',`
`106`	`106`	`value => $puppet::agent::usecacheonfailure,`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ ini_setting { 'stringify_facts_agent':`
	`110`	`+ setting => 'stringify_facts',`
	`111`	`+ section => 'main',`
	`112`	`+ value => $puppet::agent::stringify_facts;`
	`113`	`+ }`
`108`	`114`	`}`