Cleaned up role
diff --git a/tasks/main.yml b/tasks/main.yml index b848a9d..4ca7a6c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -8,15 +8,6 @@ - { key: 'copy_archive', value: '{{ copy_archive }}' } - { key: 'apigee_archive_name', value: '{{ apigee_archive_name }}' } -# tasks file for apigee-opdk-setup-local-repository -#- name: Install the local mirror with no proxy -# include_tasks: with_no_proxy.yml -# when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != '' -# -#- name: Install the local mirror with no proxy -# include_tasks: with_proxy.yml -# when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '') - - name: Install the local mirror with proxy shell: "{{ apigee_service }} apigee-mirror install" environment:
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml deleted file mode 100644 index ed95dce..0000000 --- a/tasks/with_no_proxy.yml +++ /dev/null
@@ -1,21 +0,0 @@ ---- ---- -# tasks file for apigee-opdk-setup-local-repository -- name: Install the local mirror with no proxy - shell: "{{ apigee_service }} apigee-mirror install" - args: - creates: "{{ apigee_home }}/apigee-mirror/lib/actions/nginxconfig" - -#- name: Clear the local mirror data directory with no proxy -# shell: "{{ apigee_service }} apigee-mirror clean" - -- name: Sync the local mirror with only new rpms with no proxy - shell: "{{ apigee_service }} apigee-mirror sync --only-new-rpms apigeereleasever={{ apigee_mirror_version }}" - when: all_rpms is not defined and not all_rpms | bool == True - -- name: Sync the local mirror with all rpms with no proxy - shell: "{{ apigee_service }} apigee-mirror sync apigeereleasever={{ apigee_mirror_version }}" - when: all_rpms is defined and all_rpms | bool == True - -- name: Create archive with no proxy - shell: "{{ apigee_service }} apigee-mirror package"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml deleted file mode 100644 index ecc6051..0000000 --- a/tasks/with_proxy.yml +++ /dev/null
@@ -1,38 +0,0 @@ ---- -# tasks file for apigee-opdk-setup-local-repository -- name: Install the local mirror with proxy - shell: "{{ apigee_service }} apigee-mirror install" - environment: - no_proxy: "{{ no_proxy }}" - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - -#- name: Clear the local mirror data directory with proxy -# shell: "{{ apigee_service }} apigee-mirror clean" -# environment: -# no_proxy: "{{ no_proxy }}" -# http_proxy: "{{ http_proxy }}" -# https_proxy: "{{ https_proxy }}" - -- name: Sync the local mirror with only new rpms with proxy - shell: "{{ apigee_service }} apigee-mirror sync --only-new-rpms apigeereleasever={{ apigee_mirror_version }}" - when: all_rpms is not defined and not all_rpms | bool == True - environment: - no_proxy: "{{ no_proxy }}" - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - -- name: Sync the local mirror with all rpms with proxy - shell: "{{ apigee_service }} apigee-mirror sync apigeereleasever={{ apigee_mirror_version }}" - when: all_rpms is defined and all_rpms | bool == True - environment: - no_proxy: "{{ no_proxy }}" - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}" - -- name: Create archive with proxy - shell: "{{ apigee_service }} apigee-mirror package" - environment: - no_proxy: "{{ no_proxy }}" - http_proxy: "{{ http_proxy }}" - https_proxy: "{{ https_proxy }}"