Allow to set node_terminus variable

manifests/init.pp

@@ -225,6 +225,8 @@
 #
 # $server_reports::                         List of report types to include on the puppetserver
 #
+# $server_node_terminus::                   Node data plugin for catalog compiling
+#
 # $server_external_nodes::                  External nodes classifier executable
 #
 # $server_trusted_external_command::        The external trusted facts script to use.
@@ -665,6 +667,7 @@
   Optional[Stdlib::Absolutepath] $server_puppetserver_rundir = $puppet::params::server_puppetserver_rundir,
   Optional[Stdlib::Absolutepath] $server_puppetserver_logdir = $puppet::params::server_puppetserver_logdir,
   Optional[Pattern[/^[\d]\.[\d]+\.[\d]+$/]] $server_puppetserver_version = $puppet::params::server_puppetserver_version,
+  Enum['plain', 'exec', 'classifier'] $server_node_terminus = $puppet::params::server_node_terminus,
   Variant[Undef, String[0], Stdlib::Absolutepath] $server_external_nodes = $puppet::params::server_external_nodes,
   Optional[Stdlib::Absolutepath] $server_trusted_external_command = $puppet::params::server_trusted_external_command,
   Array[String] $server_cipher_suites = $puppet::params::server_cipher_suites,

manifests/params.pp

@@ -221,6 +221,7 @@
   $server_ca                       = true
   $server_ca_crl_sync              = false
   $server_reports                  = 'foreman'
+  $server_node_terminus            = 'exec'
   $server_external_nodes           = "${dir}/node.rb"
   $server_trusted_external_command = undef
   $server_request_timeout          = 60

manifests/server.pp

@@ -58,6 +58,8 @@
 #
 # $reports::                           List of report types to include on the puppetserver
 #
+# $node_terminus::                     Node data plugin for catalog compiling
+#
 # $external_nodes::                    External nodes classifier executable
 #
 # $trusted_external_command::          The external trusted facts script to use.
@@ -373,6 +375,7 @@
   Optional[Stdlib::Absolutepath] $puppetserver_logdir = $puppet::server_puppetserver_logdir,
   Stdlib::Absolutepath $puppetserver_dir = $puppet::server_puppetserver_dir,
   Optional[Pattern[/^[\d]\.[\d]+\.[\d]+$/]] $puppetserver_version = $puppet::server_puppetserver_version,
+  Enum['plain', 'exec', 'classifier'] $node_terminus = $puppet::server_node_terminus,
   Variant[Undef, String[0], Stdlib::Absolutepath] $external_nodes = $puppet::server_external_nodes,
   Optional[Stdlib::Absolutepath] $trusted_external_command = $puppet::server_trusted_external_command,
   Array[String] $cipher_suites = $puppet::server_cipher_suites,

manifests/server/config.pp

@@ -33,14 +33,38 @@
   ## General configuration
   $ca_server                   = $puppet::ca_server
   $ca_port                     = $puppet::ca_port
+  $server_node_terminus        = $puppet::server::node_terminus
   $server_external_nodes       = $puppet::server::external_nodes
   $server_environment_timeout  = $puppet::server::environment_timeout
   $trusted_external_command    = $puppet::server::trusted_external_command
   $primary_envs_dir            = $puppet::server::envs_dir[0]
 
+  case $server_node_terminus {
+    'plain': {}
+    'exec': {
+      class { 'puppet::server::enc':
+        node_terminus => $server_node_terminus,
+        enc_path      => $server_external_nodes,
+      }
+    }
+    'console': {
+      class { 'puppet::server::enc':
+        node_terminus => $server_node_terminus,
+      }
+    }
+    default: {
+      fail('Invalid value of $server_node_terminus')
+    }
+  }
+
   if $server_external_nodes and $server_external_nodes != '' {
     class { 'puppet::server::enc':
-      enc_path => $server_external_nodes,
+      node_terminus => $server_node_terminus,
+      enc_path      => $server_external_nodes,
+    }
+  } else {
+    class { 'puppet::server::enc':
+      node_terminus => $server_node_terminus,
     }
   }
 

manifests/server/enc.pp

@@ -1,10 +1,18 @@
 # Set up the ENC config
 # @api private
 class puppet::server::enc (
-  Variant[Undef, String[0], Stdlib::Absolutepath] $enc_path = $puppet::server::external_nodes
+  Variant[Undef, String[0], Stdlib::Absolutepath] $enc_path = $puppet::server::external_nodes,
+  Enum['plain', 'exec', 'classifier'] $node_terminus = $puppet::server::node_terminus,
 ) {
-  puppet::config::server {
-    'external_nodes':     value => $enc_path;
-    'node_terminus':      value => 'exec';
+  if $enc_path and $enc_path != '' {
+    puppet::config::server {
+      'external_nodes':     value => $enc_path;
+      'node_terminus':      value => $node_terminus;
+    }
+  }
+  else {
+    puppet::config::server {
+      'node_terminus':      value => $node_terminus;
+    }
   }
 }

spec/classes/puppet_server_spec.rb

@@ -47,15 +47,15 @@
       end
 
       describe 'with no custom parameters' do
         it { should compile.with_all_deps }
 
         # install
         it { should contain_class('puppet::server::install') }
         it { should contain_user('puppet') }
         it { should contain_package(puppetserver_pkg).with_install_options(nil) }
 
         # config
         it { should contain_class('puppet::server::config') }
         it { should contain_puppet__config__main('reports').with_value('foreman') }
         it { should contain_puppet__config__main('hiera_config').with_value('$confdir/hiera.yaml') }
         it { should contain_puppet__config__main('environmentpath').with_value(environments_dir) }
@@ -283,12 +283,25 @@
         it { should contain_puppet__config__main('hiera_config').with_value('/etc/puppet/hiera/production/hiera.yaml') }
       end
 
-      describe 'without foreman' do
+      describe 'without foreman, default external ENC' do
         let(:params) do
           super().merge(
             server_foreman: false,
             server_reports: 'store',
-            server_external_nodes: ''
+          )
+        end
+
+        it { should_not contain_class('puppetserver_foreman') }
+        it { should contain_puppet__config__server('node_terminus').with_value('exec') }
+        it { should contain_puppet__config__server('external_nodes').with_value('/etc/puppetlabs/puppet/node.rb') }
+      end
+
+      describe 'without foreman, plain ENC' do
+        let(:params) do
+          super().merge(
+            server_foreman: false,
+            server_reports: 'store',
+            node_terminus: 'plain'
           )
         end
 
@@ -297,6 +310,16 @@
         it { should_not contain_puppet__config__server('external_nodes') }
       end
 
+      describe 'invalid node_terminus' do
+        let(:params) do
+          super().merge(
+            server_node_terminus: 'loremIpsum',
+          )
+        end
+
+        it { should raise_error(Puppet::Error, %r{Invalid value of $server_node_terminus}) }
+      end
+
       describe 'with server_default_manifest => true and undef content' do
         let(:params) do
           super().merge(server_default_manifest: true)
@@ -484,7 +507,7 @@
             )
           end
 
           it 'should not sync the crl' do
             # https://github.com/puppetlabs/rspec-puppet/issues/37
             pending("rspec-puppet always sets $server_facts['servername']")
             should_not contain_file('/etc/custom/puppetlabs/puppet/ssl/crl.pem')