Merge pull request #567 from GabrielNagy/MODULES-11112/yumrepo-proxy

(MODULES-11112) Add parameter puppet_agent::proxy

Author: GabrielNagy

README.markdown

@@ -43,6 +43,8 @@
         - [`use_alternate_sources`](#use_alternate_sources)
         - [`alternate_pe_source`](#alternate_pe_source)
         - [`install_dir`](#install_dir)
+        - [`disable_proxy`](#disable_proxy)
+        - [`proxy`](#proxy)
         - [`install_options`](#install_options)
         - [`msi_move_locked_files`](#msi_move_locked_files)
         - [`wait_for_pxp_agent_exit`](#wait_for_pxp_agent_exit)
@@ -287,6 +289,20 @@ The directory the puppet agent should be installed to. This is only applicable f
   install_dir => 'D:\Program Files\Puppet Labs'
 ```
 
+##### `disable_proxy`
+
+This setting controls whether or not the Puppet repositories are configured with proxies. Currently this is only supported on RedHat-based OSes.
+``` puppet
+  disable_proxy => true
+```
+
+##### `proxy`
+
+This setting specifies the proxy with which to configure the Puppet repos. Currently this is only supported on RedHat-based OSes.
+``` puppet
+  proxy => 'http://myrepo-proxy.example.com'
+```
+
 ##### `install_options`
 
 An array of additional options to pass when installing puppet-agent. Each option in the array can be either a string or a hash. Each option is automatically quoted when passed to the install command.

manifests/init.pp

@@ -119,6 +119,7 @@
   $alternate_pe_source     = undef,
   $install_dir             = undef,
   $disable_proxy           = false,
+  $proxy                   = undef,
   $install_options         = [],
   $skip_if_unavailable     = 'absent',
   $msi_move_locked_files   = false,

manifests/osfamily/redhat.pp

@@ -145,7 +145,7 @@
     if $::puppet_agent::manage_repo == true {
       $_proxy = $::puppet_agent::disable_proxy ? {
         true    => '_none_',
-        default => undef,
+        default => $::puppet_agent::proxy,
       }
       yumrepo { 'pc_repo':
         baseurl             => $source,

spec/classes/puppet_agent_osfamily_redhat_spec.rb

@@ -201,6 +201,18 @@
             is_expected.to contain_yumrepo('pc_repo').with_proxy('_none_')
           }
         end
+        describe 'proxy' do
+          let(:params) {
+            {
+              :manage_repo     => true,
+              :package_version => package_version,
+              :proxy           => 'http://myrepo-proxy.example.com',
+            }
+          }
+          it {
+            is_expected.to contain_yumrepo('pc_repo').with_proxy('http://myrepo-proxy.example.com')
+          }
+        end
         describe 'skip repo if unavailable' do
           let(:params) {
             {