Add spec test for ordering and trusted facts

Author: Stephen

manifests/agent.pp

@@ -19,6 +19,7 @@
 #   ['use_srv_records']       - Whethere to use srv records
 #   ['srv_domain']            - Domain to request the srv records
 #   ['ordering']              - The way the agent processes resources. New feature in puppet 3.3.0
+#   ['trusted_node_data']     - Enable the trusted facts hash
 #
 # Actions:
 # - Install and configures the puppet agent
@@ -49,7 +50,8 @@
   $pluginsync             = true,
   $use_srv_records        = false,
   $srv_domain             = undef,
-  $ordering               = undef
+  $ordering               = undef,
+  $trusted_node_data      = undef,
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -188,17 +190,27 @@
     }
   }
 
-  if (($ordering) and ($::puppetversion < '3.3.0'))
+  if $ordering != undef
   {
-    fail('ordering requires puppet verions 3.3.0 or greater')
+    $orderign_ensure = 'present'
+  }else {
+    $orderign_ensure = 'absent'
   }
-  elsif (($ordering) and ($::puppetversion >= '3.3.0'))
+  ini_setting {'puppetagentordering':
+    ensure  => $orderign_ensure,
+    setting => 'ordering',
+    value   => $ordering,
+  }
+  if $trusted_node_data != undef
   {
-    ini_setting {'puppetagentordering':
-      ensure  => present,
-      setting => 'ordering',
-      value   => $ordering,
-    }
+    $trusted_node_data_ensure = 'present'
+  }else {
+    $trusted_node_data_ensure = 'absent'
+  }
+  ini_setting {'puppetagenttrusted_node_data':
+    ensure  => $trusted_node_data_ensure,
+    setting => 'trusted_node_data',
+    value   => $trusted_node_data,
   }
 
   ini_setting {'puppetagentenvironment':

spec/classes/puppet_agent_spec.rb

@@ -160,7 +160,6 @@
             end
         end
     end
-
     context 'on RedHat operatingsystems' do
         let(:facts) do
             {
@@ -320,4 +319,129 @@
             end
         end
     end
+
+    describe 'Ordering' do
+        let(:facts) do
+            {
+                :osfamily        => 'RedHat',
+                :operatingsystem => 'RedHat',
+                :kernel          => 'Linux'
+            }
+        end
+        context 'with ordering 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',
+                    :ordering               => 'manifest',
+                    :puppet_run_interval    => 30,
+                    :puppet_server_port     => 8140,
+                    :use_srv_records        => false,
+                }
+            end
+
+            it{
+                should contain_ini_setting('puppetagentordering').with(
+                    :ensure  => 'present',
+                    :section => 'agent',
+                    :setting => 'ordering',
+                    :value   => 'manifest',
+                    :path    => '/etc/puppet/puppet.conf'
+                    )
+            }
+        end
+
+        context 'with ordering 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,
+                }
+            end
+
+            it{
+                should contain_ini_setting('puppetagentordering').with(
+                    :ensure  => 'absent',
+                    :section => 'agent',
+                    :setting => 'ordering',
+                    :path    => '/etc/puppet/puppet.conf'
+                    )
+            }
+        end
+    end
+    describe 'Trusted fact' do
+        let(:facts) do
+            {
+                :osfamily        => 'RedHat',
+                :operatingsystem => 'RedHat',
+                :kernel          => 'Linux'
+            }
+        end
+        context 'with trusted 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',
+                    :trusted_node_data      => 'true',
+                    :puppet_run_interval    => 30,
+                    :puppet_server_port     => 8140,
+                    :use_srv_records        => false,
+                }
+            end
+
+            it{
+                should contain_ini_setting('puppetagenttrusted_node_data').with(
+                    :ensure  => 'present',
+                    :section => 'agent',
+                    :setting => 'trusted_node_data',
+                    :value   => 'true',
+                    :path    => '/etc/puppet/puppet.conf'
+                    )
+            }
+        end
+
+        context 'with trusted 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,
+                }
+            end
+
+            it{
+                should contain_ini_setting('puppetagenttrusted_node_data').with(
+                    :ensure  => 'absent',
+                    :section => 'agent',
+                    :setting => 'trusted_node_data',
+                    :path    => '/etc/puppet/puppet.conf'
+                    )
+            }
+        end
+    end
 end