Added external_nodes and node_terminus parameters to allow puppet::master to use an ENC

Author: redstonemercury

manifests/master.pp

@@ -7,6 +7,8 @@
 #  ['group_id']                 - The groupid of the puppet group
 #  ['modulepath']               - Module path to be served by the puppet master
 #  ['manifest']                 - Manifest path
+#  ['external_nodes']           - ENC script path
+#  ['node_terminus']            - Node terminus setting, is overridden to 'exec' if external_nodes is set
 #  ['hiera_config']             - Hiera config file path
 #  ['environments']             - Which environment method (directory or config)
 #  ['environmentpath']          - Puppet environment base path (use with environments directory)
@@ -55,6 +57,8 @@
   $group_id                   = undef,
   $modulepath                 = $::puppet::params::modulepath,
   $manifest                   = $::puppet::params::manifest,
+  $external_nodes             = 'UNSET',
+  $node_terminus              = 'UNSET',
   $hiera_config               = $::puppet::params::hiera_config,
   $environmentpath            = $::puppet::params::environmentpath,
   $environments               = $::puppet::params::environments,
@@ -225,6 +229,27 @@
     value   => $environmentpath,
   }
 
+  if $external_nodes != 'UNSET'{
+    ini_setting {'puppetmasterencconfig':
+      ensure  => present,
+      setting => 'external_nodes',
+      value   => $external_nodes,
+    }
+
+    ini_setting {'puppetmasternodeterminus':
+      ensure  => present,
+      setting => 'node_terminus',
+      value   => 'exec'
+    }
+  }
+  elsif $node_terminus != 'UNSET'{
+    ini_setting {'puppetmasternodeterminus':
+      ensure  => present,
+      setting => 'node_terminus',
+      value   => $node_terminus
+    }
+  }
+
   ini_setting {'puppetmasterhieraconfig':
     ensure  => present,
     setting => 'hiera_config',

spec/classes/puppet_master_spec.rb

@@ -18,6 +18,8 @@
                 :puppet_master_service  => 'puppetmaster',
                 :modulepath             => '/etc/puppet/modules',
                 :manifest               => '/etc/puppet/manifests/site.pp',
+                :external_nodes         => '/usr/local/bin/puppet_node_classifier',
+                :node_terminus          => 'exec',
                 :autosign               => 'true',
                 :certname               => 'test.example.com',
                 :storeconfigs           => 'true',
@@ -94,6 +96,22 @@
                 :value   => params[:manifest],
                 :require => 'File[/etc/puppet/puppet.conf]'
             )
+            should contain_ini_setting('puppetmasterencconfig').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'external_nodes',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:external_nodes],
+                :require => 'File[/etc/puppet/puppet.conf]'
+            )
+            should contain_ini_setting('puppetmasternodeterminus').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'node_terminus',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:node_terminus],
+                :require => 'File[/etc/puppet/puppet.conf]'
+            )
             should contain_ini_setting('puppetmasterautosign').with(
                 :ensure  => 'present',
                 :section => 'master',
@@ -163,6 +181,8 @@
                 :puppet_master_service  => 'puppetmaster',
                 :modulepath             => '/etc/puppet/modules',
                 :manifest               => '/etc/puppet/manifests/site.pp',
+                :external_nodes         => '/usr/local/bin/puppet_node_classifier',
+                :node_terminus          => 'exec',
                 :autosign               => 'true',
                 :certname               => 'test.example.com',
                 :storeconfigs           => 'true',
@@ -237,6 +257,22 @@
                 :value   => params[:manifest],
                 :require => 'File[/etc/puppet/puppet.conf]'
             )
+            should contain_ini_setting('puppetmasterencconfig').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'external_nodes',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:external_nodes],
+                :require => 'File[/etc/puppet/puppet.conf]'
+            )
+            should contain_ini_setting('puppetmasternodeterminus').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'node_terminus',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:node_terminus],
+                :require => 'File[/etc/puppet/puppet.conf]'
+            )
             should contain_ini_setting('puppetmasterautosign').with(
                 :ensure  => 'present',
                 :section => 'master',