Merge branch 'rfletcher-proxy-options'

Author: stephenrjohnson

manifests/agent.pp

@@ -35,6 +35,8 @@
 #   ['cron_minute']           - What minute to run if puppet_run_style is cron
 #   ['serialization_format']  - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
 #   ['serialization_package'] - defaults to undef, if provided, we install this package, otherwise we fall back to the gem from 'serialization_format'
+#   ['http_proxy_host']       - The hostname of an HTTP proxy to use for agent -> master connections
+#   ['http_proxy_port']       - The port to use when puppet uses an HTTP proxy
 #
 # Actions:
 # - Install and configures the puppet agent

spec/classes/puppet_agent_spec.rb

@@ -577,4 +577,56 @@
       }
     end
   end
+  describe 'puppetagenthttpproxyhost' do
+    let(:facts) do
+      {
+        :osfamily        => 'RedHat',
+        :operatingsystem => 'RedHat',
+        :kernel          => 'Linux'
+      }
+    end
+    context 'with http_proxy_host set' do
+      let(:params) do
+        {
+          :http_proxy_host => 'proxy.example.com',
+        }
+      end
+
+      it{
+        should contain_ini_setting('puppetagenthttpproxyhost').with(
+          :ensure  => 'present',
+          :section => 'agent',
+          :setting => 'http_proxy_host',
+          :value   => 'proxy.example.com',
+          :path    => '/etc/puppet/puppet.conf'
+        )
+      }
+    end
+  end
+  describe 'puppetagenthttpproxyport' do
+    let(:facts) do
+      {
+        :osfamily        => 'RedHat',
+        :operatingsystem => 'RedHat',
+        :kernel          => 'Linux'
+      }
+    end
+    context 'with http_proxy_port set' do
+      let(:params) do
+        {
+          :http_proxy_port => '1234',
+        }
+      end
+
+      it{
+        should contain_ini_setting('puppetagenthttpproxyport').with(
+          :ensure  => 'present',
+          :section => 'agent',
+          :setting => 'http_proxy_port',
+          :value   => '1234',
+          :path    => '/etc/puppet/puppet.conf'
+        )
+      }
+    end
+  end
 end