Google Git
Sign in
edge/private-cloud-ansible-playbooks/apigee-opdk-setup-org/0f25ce341d5ea080cd43b11802f8394fa04c36c4^!/.
commit
0f25ce341d5ea080cd43b11802f8394fa04c36c4
[log]
author
Carlos Frias <carlos.frias.01@gmail.com>
Wed Sep 20 23:36:32 2017 -0400
committer
Carlos Frias <carlos.frias.01@gmail.com>
Wed Sep 20 23:36:32 2017 -0400
tree
cedbe5c4e90e02c8ab76dceb925894b9170d0fa2
parent
bc81954cb2fd289a70016c6d7a489baf73eff711 [diff]
updated logic and cleaned up playbook interactions

diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 5050722..62e7967 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml

@@ -6,13 +6,13 @@
 
 - name: Ensure apigee-provision is current by uninstalling this first with no proxy
   ignore_errors: yes
-  shell: '{{ apigee_service }} apigee-provision install'
+  shell: '{{ apigee_service }} apigee-provision uninstall'
   when: not apigee_provision_status.stat.exists
 
 - name: Apigee provision installation with no proxy
   shell: '{{ apigee_service }} apigee-provision install'
   when: not apigee_provision_status.stat.exists
 
-#- name: Apigee organization setup with no proxy
-#  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
-#  ignore_errors: yes
+- name: Apigee organization setup with no proxy
+  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
+  ignore_errors: yes

diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index e76e45c..d5ddc20 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml

@@ -6,7 +6,7 @@
 
 - name: Ensure apigee-provision is current by uninstalling this first with proxy
   ignore_errors: yes
-  shell: '{{ apigee_service }} apigee-provision install'
+  shell: '{{ apigee_service }} apigee-provision uninstall'
   when: not apigee_provision_status.stat.exists
   environment:
     no_proxy: "{{ no_proxy }}"
@@ -21,10 +21,10 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
 
-#- name: Apigee organization setup with proxy
-#  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
-#  ignore_errors: yes
-#  environment:
-#    no_proxy: "{{ no_proxy }}"
-#    http_proxy: "{{ http_proxy }}"
-#    https_proxy: "{{ https_proxy }}"
+- name: Apigee organization setup with proxy
+  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
+  ignore_errors: yes
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"