Fix merge conflicts

Author: Stephen

manifests/master.pp

@@ -88,6 +88,7 @@
   $digest_algorithm           = $::puppet::params::digest_algorithm,
   $generate_ssl_certs         = true,
   $strict_variables           = undef,
+  $puppetdb_version           = 'present',
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -197,6 +198,7 @@
       puppet_master_package      => $puppet_master_package,
       puppetdb_startup_timeout   => $puppetdb_startup_timeout,
       puppetdb_strict_validation => $puppetdb_strict_validation,
+      puppetdb_version           => $puppetdb_version,
     } ->
     Anchor['puppet::master::end']
   }

manifests/storeconfigs.pp

@@ -27,14 +27,15 @@
 #   }
 #
 class puppet::storeconfigs(
-    $dbserver,
     $dbport,
-    $puppet_service,
+    $dbserver,
     $puppet_master_package,
+    $puppet_service,
     $puppetdb_startup_timeout,
     $puppetdb_strict_validation,
+    $puppetdb_version,
+    $puppet_conf    =  $::puppet::params::puppet_conf,
     $puppet_confdir =  $::puppet::params::confdir,
-    $puppet_conf    =  $::puppet::params::puppet_conf
 )inherits puppet::params {
 
   ##If we point at a puppetdb on this machine
@@ -57,6 +58,7 @@
       puppetdb_startup_timeout => $puppetdb_startup_timeout,
       strict_validation        => $puppetdb_strict_validation,
       require                  => $require,
+      puppetdb_version         => $puppetdb_version,
     }
   }
 }

spec/classes/puppet_storeconfigs_spec.rb

@@ -18,7 +18,8 @@
                 :puppet_conf           => '/etc/puppet/puppet.conf',
                 :puppet_master_package => 'puppstmaster',
                 :puppetdb_startup_timeout => '60',
-                :puppetdb_strict_validation => true
+                :puppetdb_strict_validation => true,
+                :puppetdb_version => 'present'
             }
         end
 
@@ -44,7 +45,8 @@
                 :puppet_conf           => '/etc/puppet/puppet.conf',
                 :puppet_master_package => 'puppstmaster',
                 :puppetdb_startup_timeout => '60',
-                :puppetdb_strict_validation => true
+                :puppetdb_strict_validation => true,
+                :puppetdb_version => 'present'
             }
         end
 

tests/storedconfigs.pp

@@ -1,5 +1,6 @@
 class {'puppet::storeconfigs':
   dbserver => 'test.example.com',
   dbport => '8081',
-  puppet_service => Service['httpd']
+  puppet_service => Service['httpd'],
+  puppetdb_version => 'present'
 }