Updates to docs and sequence of role invocations.
diff --git a/defaults/main.yml b/defaults/main.yml
index 6d41e49..44162d7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,10 @@
---
# defaults file for apigee-opdk-setup-os-common-extra
-#os_packages:
-#- lsof
-#- nc
-#- dos2unix
-#- tcpdump
-#- telnet
-#- vim
-#- tree
+os_packages:
+- lsof
+- nc
+- dos2unix
+- tcpdump
+- telnet
+- vim
+- tree
diff --git a/tasks/main.yml b/tasks/main.yml
index 44114ed..c1cb156 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,50 +1,12 @@
---
-# tasks file for apigee-opdk-setup-os-common-extra
-- block:
-
- - name: Update troubleshooting OS packages
- become: yes
- yum:
- name: "{{ item }}"
- state: present
- with_items: "{{ os_packages }}"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
-
- rescue:
-
- - name: Check for existence of epel.repo
- stat:
- path: /etc/yum.repos.d/epel.repo
- register: epel
-
- - block:
-
- - 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"
-
- when: epel.stat.exists
-
- - name: Update troubleshooting OS packages
- become: yes
- yum:
- name: "{{ item }}"
- state: present
- with_items: "{{ os_packages }}"
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
- no_proxy: "{{ no_proxy }}"
+# tasks file for apigee-opdk-setup-os-common
+- name: Update troubleshooting OS packages
+ become: yes
+ yum:
+ name: "{{ item }}"
+ state: present
+ with_items: "{{ os_packages }}"
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ no_proxy: "{{ no_proxy }}"
