(PDB-1485) Add default PuppetDB root context

This commit changes the terminus configuration to use the new root
prefix for PuppetDB and changes the connection validator to do the same.

This commit also adds the terminus package name changes `terminus` to
`termini` and tries to be smart about the default, checking to see what
version of PuppetDB was passed in and defaulting off of that value.

Author: Andrew Roetker

lib/puppet/util/puppetdb_validator.rb

@@ -10,7 +10,7 @@ class PuppetdbValidator
       attr_reader :test_path
       attr_reader :test_headers
 
-      def initialize(puppetdb_server, puppetdb_port, use_ssl=true, test_path = "/v3/version")
+      def initialize(puppetdb_server, puppetdb_port, use_ssl=true, test_path = "/pdb/query/v4/version")
         @puppetdb_server = puppetdb_server
         @puppetdb_port   = puppetdb_port
         @use_ssl         = use_ssl

manifests/master/config.pp

@@ -23,14 +23,27 @@
   $puppet_confdir              = $puppetdb::params::puppet_confdir,
   $puppet_conf                 = $puppetdb::params::puppet_conf,
   $puppetdb_version            = $puppetdb::params::puppetdb_version,
-  $terminus_package            = $puppetdb::params::terminus_package,
+  $terminus_package            = '',
   $puppet_service_name         = $puppetdb::params::puppet_service_name,
   $puppetdb_startup_timeout    = $puppetdb::params::puppetdb_startup_timeout,
   $test_url                    = $puppetdb::params::test_url,
   $restart_puppet              = true,
 ) inherits puppetdb::params {
 
-  package { $terminus_package:
+  if empty($terminus_package) {
+    $old_terminus_name = versioncmp($puppetdb_version, '3.0.0') < 0
+    $terminus_package_name = $puppetdb_version ? {
+      /(latest|present|absent)/ => 'puppetdb-termini',
+      default                   =>  $old_terminus_name ? {
+        true   => 'puppetdb-terminus',
+        false  => 'puppetdb-termini'
+      }
+    }
+  } else {
+    $terminus_package_name = $terminus_package
+  }
+
+  package { $terminus_package_name:
     ensure => $puppetdb_version,
   }
 
@@ -52,7 +65,7 @@
         default => true,
       },
       timeout         => $puppetdb_startup_timeout,
-      require         => Package[$terminus_package],
+      require         => Package[$terminus_package_name],
       test_url        => $test_url,
     }
 
@@ -71,7 +84,7 @@
       masterless     => $masterless,
       require        => $strict_validation ? {
         true    => Puppetdb_conn_validator['puppetdb_conn'],
-        default => Package[$terminus_package],
+        default => Package[$terminus_package_name],
       },
     }
   }
@@ -85,7 +98,7 @@
       masterless  => $masterless,
       require     => $strict_validation ? {
         true    => Puppetdb_conn_validator['puppetdb_conn'],
-        default => Package[$terminus_package],
+        default => Package[$terminus_package_name],
       },
     }
   }
@@ -100,7 +113,7 @@
       enable      => $enable_reports,
       require     => $strict_validation ? {
         true    => Puppetdb_conn_validator['puppetdb_conn'],
-        default => Package[$terminus_package],
+        default => Package[$terminus_package_name],
       },
     }
   }
@@ -115,7 +128,7 @@
       puppet_confdir     => $puppet_confdir,
       require            => $strict_validation ? {
         true    => Puppetdb_conn_validator['puppetdb_conn'],
-        default => Package[$terminus_package],
+        default => Package[$terminus_package_name],
       },
     }
   }

manifests/master/puppetdb_conf.pp

@@ -16,14 +16,9 @@
     path    => "${puppet_confdir}/puppetdb.conf",
   }
 
-  ini_setting { 'puppetdbserver':
-    setting => 'server',
-    value   => $server,
-  }
-
-  ini_setting { 'puppetdbport':
-    setting => 'port',
-    value   => $port,
+  ini_setting { 'puppetdbserver_urls':
+    setting => 'server_urls',
+    value   => "https://#{server}:#{port}/",
   }
 
   ini_setting { 'soft_write_failure':

manifests/params.pp

@@ -58,14 +58,13 @@
 
   $manage_firewall = true
   $java_args       = {}
-  $test_url        = '/v3/version'
+  $test_url        = '/pdb/query/v4/version'
 
   $puppetdb_package     = 'puppetdb'
   $puppetdb_service     = 'puppetdb'
   $puppetdb_user        = 'puppetdb'
   $puppetdb_group       = 'puppetdb'
   $masterless           = false
-  $terminus_package     = 'puppetdb-terminus'
 
   case $::osfamily {
     'RedHat', 'Suse', 'Archlinux': {

spec/unit/classes/master/config_spec.rb

@@ -26,53 +26,53 @@
   context 'when PuppetDB and Puppet Master are on the same server' do
 
     context 'when using default values' do
-
       let(:pre_condition) { 'class { "puppetdb": }' }
 
       it { should contain_puppetdb_conn_validator('puppetdb_conn').with(
-        :puppetdb_server => 'puppetdb.example.com',
-        :puppetdb_port => '8081',
-        :use_ssl => 'true') }
+                    :puppetdb_server => 'puppetdb.example.com',
+                    :puppetdb_port => '8081',
+                    :use_ssl => 'true') }
     end
 
     context 'when puppetdb class is declared with disable_ssl => true' do
-
       let(:pre_condition) { 'class { "puppetdb": disable_ssl => true }' }
 
       it { should contain_puppetdb_conn_validator('puppetdb_conn').with(
-        :puppetdb_port => '8080',
-        :use_ssl => 'false')
-      }
-      
+                    :puppetdb_port => '8080',
+                    :use_ssl => 'false')}
     end
 
     context 'when puppetdb_port => 1234' do
-
       let(:pre_condition) { 'class { "puppetdb": }' }
-
       let(:params) do { :puppetdb_port => '1234' } end
 
       it { should contain_puppetdb_conn_validator('puppetdb_conn').with(
-        :puppetdb_port => '1234',
-        :use_ssl => 'true')
-      }
-
+                    :puppetdb_port => '1234',
+                    :use_ssl => 'true')}
     end
 
     context 'when puppetdb_port => 1234 AND the puppetdb class is declared with disable_ssl => true' do
-
       let(:pre_condition) { 'class { "puppetdb": disable_ssl => true }' }
-
-      let(:params) do {
-        :puppetdb_port => '1234'
-      } end
+      let(:params) do {:puppetdb_port => '1234'} end
 
       it { should contain_puppetdb_conn_validator('puppetdb_conn').with(
-        :puppetdb_port => '1234',
-        :use_ssl => 'false')
-      }
+                    :puppetdb_port => '1234',
+                    :use_ssl => 'false')}
 
     end
+    
+    context 'when using default values' do
+      let (:pre_condition) { 'class { "puppetdb": }' }
+      
+      it { should contain_package('puppetdb-termini').with( :ensure => 'present' )}
+    end
+    
+    context 'when using an older puppetdb version' do
+      let (:pre_condition) { 'class { "puppetdb": puppetdb_version => "2.2.0", }' }
+      let (:params) do { :puppetdb_version => '2.2.0' } end
+      
+      it { should contain_package('puppetdb-terminus').with( :ensure => '2.2.0' )}
+    end
 
   end
 

spec/unit/util/puppetdb_validator_spec.rb

@@ -12,12 +12,12 @@
     response_not_found.stubs(:msg).returns('Not found')
 
     conn_ok = stub()
-    conn_ok.stubs(:get).with('/v3/version', {"Accept" => "application/json"}).returns(response_ok)
+    conn_ok.stubs(:get).with('/pdb/query/v4/version', {"Accept" => "application/json"}).returns(response_ok)
     conn_ok.stubs(:read_timeout=).with(2)
     conn_ok.stubs(:open_timeout=).with(2)
 
     conn_not_found = stub()
-    conn_not_found.stubs(:get).with('/v3/version', {"Accept" => "application/json"}).returns(response_not_found)
+    conn_not_found.stubs(:get).with('/pdb/query/v4/version', {"Accept" => "application/json"}).returns(response_not_found)
 
     Puppet::Network::HttpPool.stubs(:http_instance).raises('Unknown host')
     Puppet::Network::HttpPool.stubs(:http_instance).with('mypuppetdb.com', 8080, true).raises('Connection refused')