Merge pull request #35 from karlmdavis/issue-34-rework-proxy-support

Reworked support for HTTP proxies.

Author: karlmdavis

defaults/main.yml

@@ -74,6 +74,15 @@ jenkins_plugins_extra: []
 # Additional options that will be added to JAVA_ARGS
 jenkins_java_args_extra: ''
 
-# This should only be modified if operating in a restricted Internet
-# environment, such that not all of the Jenkins mirrors will be accessible.
-jenkins_downloads_url_root: 'https://pkg.jenkins.io'
+##
+# These should only be modified if custom/local mirrors of the YUM, APT, and/or
+# plugins repositories are being used.
+##
+
+# The base URL of the custom YUM/APT repo to be used (the portion that's shared
+# by the signing key and packages).
+jenkins_packages_url_base: 'https://pkg.jenkins.io'
+
+# Set to `true` to add a `proxy: _none_` setting for the YUM repo.
+jenkins_packages_repo_yum_disable_proxy: false
+

tasks/packages_Debian.yml

@@ -12,18 +12,18 @@
     # Allows use of HTTPS APT repos.
     - apt-transport-https
 
-- name: Determine APT URL to Use
+- name: Determine APT Key and Repo to Use (Step 1)
   set_fact:
-    jenkins_downloads_url_directory: "{{ 'debian' if jenkins_release_line == 'weekly' else 'debian-stable' }}"
+    jenkins_apt_repo_flavor: "{{ 'debian' if jenkins_release_line == 'weekly' else 'debian-stable' }}"
 
-- name: Determine APT Key and Repo to Use
+- name: Determine APT Key and Repo to Use (Step 2)
   set_fact:
-    jenkins_apt_key: "{{ '%s/%s/jenkins.io.key' % (jenkins_downloads_url_root, jenkins_downloads_url_directory) }}"
-    jenkins_apt_repo: "{{ 'deb %s/%s binary/' % (jenkins_downloads_url_root, jenkins_downloads_url_directory) }}"
+    jenkins_apt_key_url: "{{ '%s/%s/jenkins.io.key' % (jenkins_packages_url_base, jenkins_apt_repo_flavor) }}"
+    jenkins_apt_repo: "{{ 'deb %s/%s binary/' % (jenkins_packages_url_base, jenkins_apt_repo_flavor) }}"
 
 - name: Add Jenkins APT Key
   apt_key:
-    url: "{{ jenkins_apt_key }}"
+    url: "{{ jenkins_apt_key_url }}"
     state: present
   become: true
 

tasks/packages_RedHat.yml

@@ -1,13 +1,13 @@
 ---
-- name: Determine YUM URL to Use
+- name: Determine YUM Repo to Use (Step 1)
   set_fact:
-    jenkins_downloads_url_directory: "{{ 'redhat' if jenkins_release_line == 'weekly' else 'redhat-stable' }}"
+    jenkins_yum_repo_flavor: "{{ 'redhat' if jenkins_release_line == 'weekly' else 'redhat-stable' }}"
 
-- name: Determine YUM Repo to Use
+- name: Determine YUM Repo to Use (Step 2)
   set_fact:
+    jenkins_yum_gpgkey_url: "{{ '%s/%s/jenkins.io.key' % (jenkins_packages_url_base, jenkins_yum_repo_flavor) }}"
+    jenkins_yum_repo_baseurl: "{{ '%s/%s' % (jenkins_packages_url_base, jenkins_yum_repo_flavor) }}"
     jenkins_yum_repo_name: "{{ 'Jenkins' if jenkins_release_line == 'weekly' else 'Jenkins-stable' }}"
-    jenkins_yum_repo_baseurl: "{{ '%s/%s' % (jenkins_downloads_url_root, jenkins_downloads_url_directory) }}"
-    jenkins_yum_repo_gpgkey: "{{ '%s/%s/jenkins.io.key' % (jenkins_downloads_url_root, jenkins_downloads_url_directory) }}"
 
 - name: Remove Unused Jenkins YUM Repositories
   yum_repository:
@@ -25,7 +25,8 @@
     description: 'Jenkins release repo from https://jenkins.io/download/.'
     baseurl: "{{ jenkins_yum_repo_baseurl }}"
     gpgcheck: true
-    gpgkey: "{{ jenkins_yum_repo_gpgkey }}"
+    gpgkey: "{{ jenkins_yum_gpgkey_url }}"
+    proxy: "{{ '_none_' if jenkins_packages_repo_yum_disable_proxy == true else omit }}"
     state: present
   become: true