added proxy and no proxy usage
diff --git a/tasks/main.yml b/tasks/main.yml index 4367426..ffae9d4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -1,46 +1,10 @@ --- # tasks file for apigee-opdk-setup-os-common-extra -- block: - - name: Update toubleshooting OS packages - become: yes - yum: - name: "{{ item }}" - state: present - with_items: - - lsof - - nc - - dos2unix - - tcpdump - - tree - - telnet - - vim - rescue: +- name: Do not use proxy definitions + include: with_no_proxy.yml + when: http_proxy is not defined and https_proxy is not defined - - name: expose baseurl in epel.repo definition - replace: - backup: yes - regexp: '^(#baseurl=)(.*)' - replace: 'baseurl=\2' - dest: '/etc/yum.repos.d/epel.repo' - - - name: remove mirrorlist in epel.repo definition - replace: - backup: yes - regexp: '^(mirrorlist=)(.*)' - replace: '#mirrorlist=\2' - dest: /etc/yum.repos.d/epel.repo" - - - name: Update toubleshooting OS packages - become: yes - yum: - name: "{{ item }}" - state: present - with_items: - - lsof - - nc - - dos2unix - - tcpdump - - tree - - telnet - - vim +- name: Use proxy definitions + include: with_proxy.yml + when: http_proxy is defined and https_proxy is defined
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml new file mode 100644 index 0000000..e9dee99 --- /dev/null +++ b/tasks/with_no_proxy.yml
@@ -0,0 +1,46 @@ +--- + +- block: + - name: Update toubleshooting OS packages + become: yes + yum: + name: "{{ item }}" + state: present + with_items: + - lsof + - nc + - dos2unix + - tcpdump + - tree + - telnet + - vim + + rescue: + + - name: expose baseurl in epel.repo definition + replace: + backup: yes + regexp: '^(#baseurl=)(.*)' + replace: 'baseurl=\2' + dest: '/etc/yum.repos.d/epel.repo' + + - name: remove mirrorlist in epel.repo definition + replace: + backup: yes + regexp: '^(mirrorlist=)(.*)' + replace: '#mirrorlist=\2' + dest: /etc/yum.repos.d/epel.repo" + + - name: Update toubleshooting OS packages + become: yes + yum: + name: "{{ item }}" + state: present + with_items: + - lsof + - nc + - dos2unix + - tcpdump + - tree + - telnet + - vim
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml new file mode 100644 index 0000000..5b04d6e --- /dev/null +++ b/tasks/with_proxy.yml
@@ -0,0 +1,52 @@ +--- + +- block: + - name: Update toubleshooting OS packages + become: yes + yum: + name: "{{ item }}" + state: present + with_items: + - lsof + - nc + - dos2unix + - tcpdump + - tree + - telnet + - vim + environment: + http_proxy: "{{ http_proxy }}" + https_proxy: "{{ https_proxy }}" + + rescue: + + - name: expose baseurl in epel.repo definition + replace: + backup: yes + regexp: '^(#baseurl=)(.*)' + replace: 'baseurl=\2' + dest: '/etc/yum.repos.d/epel.repo' + + - name: remove mirrorlist in epel.repo definition + replace: + backup: yes + regexp: '^(mirrorlist=)(.*)' + replace: '#mirrorlist=\2' + dest: /etc/yum.repos.d/epel.repo" + + - name: Update toubleshooting OS packages + become: yes + yum: + name: "{{ item }}" + state: present + with_items: + - lsof + - nc + - dos2unix + - tcpdump + - tree + - telnet + - vim + environment: + http_proxy: "{{ http_proxy }}" + https_proxy: "{{ https_proxy }}"