cleaned up playbooks and usage of epel
diff --git a/tasks/main.yml b/tasks/main.yml
index ff894e1..dcf87e4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -34,6 +34,43 @@
include: with_proxy.yml
when: http_proxy is defined and https_proxy is defined
+- name: Start rngd service with no proxy
+ service:
+ name: rngd
+ enabled: yes
+ state: started
+
+- name: Update vm.swappiness with no proxy
+ become: yes
+ sysctl:
+ name: vm.swappiness
+ value: '{{ vm_swappiness }}'
+ state: present
+
+- name: Disable Default IPV6 with no proxy
+ become: yes
+ sysctl:
+ name: net.ipv6.conf.default.disable_ipv6
+ value: 1
+ sysctl_set: yes
+ tags: ['ipv6']
+
+- name: Disable All IPV6 with no proxy
+ become: yes
+ sysctl:
+ name: net.ipv6.conf.all.disable_ipv6
+ value: 1
+ sysctl_set: yes
+ tags: ['ipv6']
+
+- name: Update for apigee installation environment with no proxy
+ become: yes
+ lineinfile:
+ dest: /etc/environment
+ regexp: "^export CONTINUE_ON_WARNING="
+ line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
+ backup: yes
+
- name: Update pip
become: yes
pip:
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 214334e..595cb12 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,9 +1,9 @@
---
# 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
+#- 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
@@ -17,45 +17,14 @@
# state: present
# when: epel_repo is defined and epel_repo | trim != ''
-- name: Update basic yum os packages
+- name: Update basic yum os packages with no proxy
become: yes
yum:
name: "{{ item }}"
state: present
with_items: "{{ yum_os_minimum_packages }}"
-- name: Start rngd service
- service:
- name: rngd
- enabled: yes
- state: started
-
-- name: Update vm.swappiness
- become: yes
- sysctl:
- name: vm.swappiness
- value: '{{ vm_swappiness }}'
- state: present
-
-- name: Disable Default IPV6
- become: yes
- shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
- tags: ['ipv6']
-
-- name: Disable All IPV6
- become: yes
- shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
- tags: ['ipv6']
-
-- name: Update for apigee installation environment
- become: yes
- lineinfile:
- dest: /etc/environment
- regexp: "^export CONTINUE_ON_WARNING="
- line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
- backup: yes
-
-- name: Download pip package manager
+- name: Download pip package manager with no proxy
become: yes
tags: ['pip-manager']
get_url:
@@ -63,13 +32,13 @@
dest: /tmp/get-pip.py
when: pip_conf_dir is not defined
-- name: Install pip package manager
+- name: Install pip package manager with no proxy
become: yes
tags: ['pip-manager']
shell: python /tmp/get-pip.py
when: pip_conf_dir is not defined
-- name: Update python packages
+- name: Update python packages with no proxy
become: yes
pip:
name: '{{ item }}'
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index eab7ca5..efe4f96 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -28,7 +28,7 @@
https_proxy: "{{ https_proxy }}"
no_proxy: "{{ no_proxy }}"
-- name: Update basic yum os packages
+- name: Update basic yum os packages with proxy
become: yes
yum:
name: "{{ item }}"
@@ -38,37 +38,6 @@
http_proxy: "{{ http_proxy }}"
https_proxy: "{{ https_proxy }}"
-- name: Start rngd service
- service:
- name: rngd
- enabled: yes
- state: started
-
-- name: Update vm.swappiness
- become: yes
- sysctl:
- name: vm.swappiness
- value: '{{ vm_swappiness }}'
- state: present
-
-- name: Disable Default IPV6
- become: yes
- shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
- tags: ['ipv6']
-
-- name: Disable All IPV6
- become: yes
- shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
- tags: ['ipv6']
-
-- name: Update for apigee installation environment
- become: yes
- lineinfile:
- dest: /etc/environment
- regexp: "^export CONTINUE_ON_WARNING="
- line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
- backup: yes
-
- name: Download pip package manager
become: yes
tags: ['pip-manager']
