cleaned up installation of epel
diff --git a/tasks/cleaned-up-with-no-proxy.yml b/tasks/cleaned-up-with-no-proxy.yml
deleted file mode 100644
index bd39170..0000000
--- a/tasks/cleaned-up-with-no-proxy.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# tasks file for apigee-opdk-setup-epel
-- name: Configure AWS AMI OS package manager repositories for Apigee
- shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
- when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower != 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
-
-# TODO: Look up the ansible_distribution name for RHEL systems
-- name: Register with Redhat Subscription management
- shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
- when: ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
-
-- name: Yum clean
- shell: "yum clean all"
-
-- name: Remove yum cache
- file:
- path: /var/cache/yum
- state: absent
-
-- name: Remove epel
- yum:
- name: epel-release
- state: absent
- when: opdk_version | version_compare('4.17.05', '<=')
-
-- name: Update EPEL with no proxy
- yum:
- name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
- state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index 0f9435a..cb0a8b5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,18 +13,32 @@
shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
when: ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
-- name: Update EPEL with proxy
+- name: Remove existing epel repository references
become: yes
yum:
name: epel-release
state: absent
- when: opdk_version | version_compare('4.16.09', '==')
+ when: opdk_version | version_compare('4.17.05', '<=')
environment:
http_proxy: "{{ http_proxy }}"
https_proxy: "{{ https_proxy }}"
no_proxy: "{{ no_proxy }}"
-- name: Update EPEL with proxy
+- name: Yum clean
+ become: yes
+ shell: "yum clean all"
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ no_proxy: "{{ no_proxy }}"
+
+- name: Remove yum cache
+ become: yes
+ file:
+ path: /var/cache/yum
+ state: absent
+
+- name: Update with EPEL downgrade allowed if 4.17.09 or greater
become: yes
yum:
name: epel-release
@@ -36,38 +50,13 @@
https_proxy: "{{ https_proxy }}"
no_proxy: "{{ no_proxy }}"
-- block:
- - name: Remove epel
- become: yes
- yum:
- name: epel-release
- state: absent
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- - name: Yum clean
- become: yes
- shell: "yum clean all"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- - name: Remove yum cache
- become: yes
- file:
- path: /var/cache/yum
- state: absent
-
- - name: Update EPEL with proxy
- become: yes
- yum:
- name: "{{ epel_repo }}"
- state: present
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
+- name: Update EPEL with direct rpm if 4.17.05 or less
+ become: yes
+ yum:
+ name: "{{ epel_repo }}"
+ state: present
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ no_proxy: "{{ no_proxy }}"
when: opdk_version | version_compare('4.17.05', '<=')
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
deleted file mode 100644
index d50abef..0000000
--- a/tasks/with_no_proxy.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# tasks file for apigee-opdk-setup-epel
-- name: Update EPEL with no proxy
- become: yes
- yum:
- name: epel-release
- state: absent
- when: opdk_version | version_compare('4.16.09', '==')
-
-#- name: Update EPEL with no proxy
-# yum:
-# name: epel-release
-# allow_downgrade: yes
-# state: present
-
-- name: Update EPEL with no proxy
- become: yes
- yum:
- name: "{{ epel_repo }}"
- state: present
- when: opdk_version | version_compare('4.17.05', '>')
-
-- block:
- - name: Remove epel
- become: yes
- yum:
- name: epel-release
- state: absent
-
- - name: Yum clean
- become: yes
- shell: "yum clean all"
-
- - name: Remove yum cache
- become: yes
- file:
- path: /var/cache/yum
- state: absent
-
- - name: Update with EPEL 6 with no proxy
- become: yes
- yum:
- name: "{{ epel_7_repo }}"
- state: present
- when: opdk_version | version_compare('4.17.05', '<=')
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
deleted file mode 100644
index 7958b4a..0000000
--- a/tasks/with_proxy.yml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-# tasks file for apigee-opdk-setup-epel
-- name: Update EPEL with proxy
- become: yes
- yum:
- name: epel-release
- state: absent
- when: opdk_version | version_compare('4.16.09', '==')
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
-- name: Update EPEL with proxy
- become: yes
- yum:
- name: epel-release
- state: present
- allow_downgrade: yes
- when: opdk_version | version_compare('4.17.05', '>')
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
-- block:
- - name: Remove epel
- become: yes
- yum:
- name: epel-release
- state: absent
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- - name: Yum clean
- become: yes
- shell: "yum clean all"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- - name: Remove yum cache
- become: yes
- file:
- path: /var/cache/yum
- state: absent
-
- - name: Update EPEL with proxy
- become: yes
- yum:
- name: "{{ epel_repo }}"
- state: present
- no_proxy: "{{ no_proxy }}"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- when: opdk_version | version_compare('4.17.05', '<=')
