Merge pull request puppetlabs#312 from joshcooper/json_fact_cache

(PDB-4945) Default to json fact cache

Author: austb

manifests/master/routes.pp

@@ -3,14 +3,7 @@
 class puppetdb::master::routes (
   $puppet_confdir = $puppetdb::params::puppet_confdir,
   $masterless     = $puppetdb::params::masterless,
-  $routes         = {
-    'master' => {
-      'facts' => {
-        'terminus' => 'puppetdb',
-        'cache'    => 'yaml',
-      }
-    }
-  }
+  $routes         = undef,
 ) inherits puppetdb::params {
 
   if $masterless {
@@ -26,8 +19,22 @@
         }
       }
     }
-  } else {
+  } elsif $routes {
     $routes_real = $routes
+  } else {
+    if (defined('$serverversion')) and (versioncmp($serverversion, '7.0') >= 0) {
+      $default_fact_cache = 'json'
+    } else {
+      $default_fact_cache = 'yaml'
+    }
+    $routes_real = {
+      'master' => {
+        'facts' => {
+          'terminus' => 'puppetdb',
+          'cache'    => $default_fact_cache,
+        }
+      }
+    }
   }
 
   # TODO: this will overwrite any existing routes.yaml;

spec/unit/classes/master/config_spec.rb

@@ -86,6 +86,12 @@
         operatingsystemrelease: '7.0',
         kernel: 'Linux',
         selinux: true,
+        os: {
+          family: 'RedHat',
+          name: 'RedHat',
+          release: { 'full' => '7.0' },
+          selinux: { 'enabled' => true },
+        },
       }
     end
     let(:pre_condition) { 'class { "puppetdb::globals": version => "3.1.1-1.el7", }' }
@@ -102,6 +108,12 @@
         operatingsystemrelease: '7.0',
         kernel: 'Linux',
         selinux: true,
+        os: {
+          family: 'RedHat',
+          name: 'RedHat',
+          release: { 'full' => '7.0' },
+          selinux: { 'enabled' => true },
+        },
       }
     end