Allow agent to remove templatedir as it's deprecated

Author: Stephen

manifests/agent.pp

@@ -23,6 +23,7 @@
 #   ['listen']                - If puppet agent should listen for connections
 #   ['reportserver']          - The server to send transaction reports to.
 #   ['digest_algorithm']      - The algorithm to use for file digests.
+#   ['templatedir']           - Template dir, if unset it will remove the setting.
 #
 # Actions:
 # - Install and configures the puppet agent
@@ -54,6 +55,7 @@
   $use_srv_records        = false,
   $srv_domain             = undef,
   $ordering               = undef,
+  $templatedir            = '$confdir/templates',
   $trusted_node_data      = undef,
   $listen                 = false,
   $reportserver           = '$server',
@@ -284,4 +286,21 @@
     setting => 'digest_algorithm',
     value   => $digest_algorithm,
   }
+  if ($templatedir != undef) and ($templatedir != 'undef')
+  {
+    ini_setting {'puppetagenttemplatedir':
+      ensure  => present,
+      setting => 'templatedir',
+      section => 'main',
+      value   => $templatedir,
+    }
+  }
+  else
+  {
+    ini_setting {'puppetagenttemplatedir':
+      ensure  => absent,
+      setting => 'templatedir',
+      section => 'main',
+    }
+  }
 }

spec/classes/puppet_agent_spec.rb

@@ -444,4 +444,66 @@
             }
         end
     end
+    describe 'Trusted fact' do
+        let(:facts) do
+            {
+                :osfamily        => 'RedHat',
+                :operatingsystem => 'RedHat',
+                :kernel          => 'Linux'
+            }
+        end
+    context 'with templatedir set' do
+        let(:params) do
+            {
+                :puppet_server          => 'test.exaple.com',
+                :puppet_agent_service   => 'puppet',
+                :puppet_agent_package   => 'puppet',
+                :version                => '/etc/puppet/manifests/site.pp',
+                :puppet_run_style       => 'cron',
+                :splay                  => 'true',
+                :environment            => 'production',
+                :puppet_run_interval    => 30,
+                :puppet_server_port     => 8140,
+                :use_srv_records        => false,
+            }
+        end
+
+        it{
+            should contain_ini_setting('puppetagenttemplatedir').with(
+                :ensure  => 'present',
+                :section => 'main',
+                :setting => 'templatedir',
+                :value   => '$confdir/templates',
+                :path    => '/etc/puppet/puppet.conf'
+                )
+        }
+    end
+
+    context 'with templatedir not set' do
+        let(:params) do
+            {
+                :puppet_server          => 'test.exaple.com',
+                :puppet_agent_service   => 'puppet',
+                :puppet_agent_package   => 'puppet',
+                :version                => '/etc/puppet/manifests/site.pp',
+                :puppet_run_style       => 'cron',
+                :splay                  => 'true',
+                :environment            => 'production',
+                :puppet_run_interval    => 30,
+                :puppet_server_port     => 8140,
+                :use_srv_records        => false,
+                :templatedir            => 'undef'
+            }
+        end
+
+        it{
+            should contain_ini_setting('puppetagenttemplatedir').with(
+                :ensure  => 'absent',
+                :section => 'main',
+                :setting => 'templatedir',
+                :path    => '/etc/puppet/puppet.conf'
+                )
+        }
+    end
+  end
 end