moved epel config into separate role
diff --git a/defaults/main.yml b/defaults/main.yml index b7eb485..05ad7b4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml
@@ -5,17 +5,7 @@ # Default value to limit swap file use vm_swappiness: 60 -# Default epel repo for OracleLinux 6 -epel_rhel6: http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm - -# Default epel repo for RHEL 7 -epel_rhel7: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - -# Default epel repo for RHEL 6 -#epel_rhel6: https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm - qpid_client: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-client-1.35.0-3.el7.x86_64.rpm - qpid_server: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-server-1.35.0-3.el7.x86_64.rpm pip_packages:
diff --git a/tasks/main.yml b/tasks/main.yml index 2561f14..fee451a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -1,15 +1,5 @@ --- # tasks file for apigee-opdk-setup-os - -#- name: Configure AWS AMI OS package manager repositories for Apigee -# shell: "yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional" -# when: ansible_bios_version | lower | search('amazon') and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version | version_compare('6', '>') - -# TODO: Look up the ansible_distribution name for RHEL systems -#- name: If using RHEL then register RHEL on RHN -# shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach" -# when: ansible_bios_version | lower | search('amazon') and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>') - - name: Yum clean become: yes shell: "yum clean all"
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml index 595cb12..3e396d0 100644 --- a/tasks/with_no_proxy.yml +++ b/tasks/with_no_proxy.yml
@@ -1,22 +1,10 @@ --- # tasks file for apigee-opdk-setup-os -#- 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 -# when: epel_repo is not defined and epel_repo | trim != '' - - name: Yum update with no proxy yum: name: '*' state: latest -#- name: Update EPEL from custom location with no proxy -# yum: -# name: "{{ epel_repo }}" -# state: present -# when: epel_repo is defined and epel_repo | trim != '' - - name: Update basic yum os packages with no proxy become: yes yum: