commit 6cca2f1fa707992444a21907bb20a0e3cc689fff
author Carlos Frias <carlos.frias.01@gmail.com> Mon Nov 27 15:20:21 2017 -0500
committer Carlos Frias <carlos.frias.01@gmail.com> Mon Nov 27 15:20:21 2017 -0500
tree 459144771ea81e7fb2747996eff05a4d9b519ad8
parent e9fdf2fdfdf797ddad0afa97ad8e140eac65cb64

updated logic

defaults/main.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index cc8aa78..6c8847a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,10 @@
 ---
 # defaults file for apigee-opdk-setup-bootstrap-rollback
+apigee_packages:
+- apigee*
+- edge*
+- baas*
+- qpid*
+- python-qpid-*
+- libdb-cxx-*
+- nginx-*

tasks/main.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index f96b66c..cadadc9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,28 +10,13 @@
   shell: "{{ apigee_service }} apigee-service uninstall"
   when: apigee_service is defined and apigee_service | trim | length > 0
 
-#- name: Use no proxy definitions
-#  include_tasks: no_proxy.yml
-#  when: http_proxy is not defined and https_proxy is not defined
-#
-#- name: Use proxy definitions
-#  include_tasks: with_proxy.yml
-#  when: http_proxy is defined and https_proxy is defined
-
 - name: Remove apigee, edge, baas and qpid packages
   become: yes
   ignore_errors: yes
   yum:
     name: '{{ item }}'
     state: absent
-  with_items:
-  - apigee*
-  - edge*
-  - baas*
-  - qpid*
-  - python-qpid-*
-  - libdb-cxx-*
-  - nginx-*
+  with_items: "{{ apigee_packages}}"
   environment:
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"

tasks/no_proxy.yml

diff --git a/tasks/no_proxy.yml b/tasks/no_proxy.yml
deleted file mode 100644
index 250f920..0000000
--- a/tasks/no_proxy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Remove apigee, edge, baas and qpid packages
-  become: yes
-  ignore_errors: yes
-  yum:
-    name: '{{ item }}'
-    state: absent
-  with_items:
-  - apigee*
-  - edge*
-  - baas*
-  - qpid*
-  - python-qpid-*
-  - libdb-cxx-*
-  - nginx-*

tasks/with_proxy.yml

diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
deleted file mode 100644
index 858ff67..0000000
--- a/tasks/with_proxy.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: Remove apigee, edge, baas and qpid packages
-  become: yes
-  ignore_errors: yes
-  yum:
-    name: '{{ item }}'
-    state: absent
-  with_items:
-  - apigee*
-  - edge*
-  - baas*
-  - qpid*
-  - python-qpid-*
-  - libdb-cxx-*
-  - nginx-*
-  environment:
-    http_proxy: "{{ http_proxy }}"
-    https_proxy: "{{ https_proxy }}"