updated when logic for http_proxy usage
diff --git a/tasks/main.yml b/tasks/main.yml
index 743aeea..36c9556 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -76,70 +76,69 @@
shell: "yum clean all"
- block:
- - block:
- - name: Update apigee-service if upgrade_edge is set as part of an upgrade
- shell: "bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
- env:
- JAVA_HOME: '{{ java_home }}'
- when: upgrade_edge is defined and upgrade_edge | bool == True
+ - name: Update apigee-service if upgrade_edge is set as part of an upgrade
+ shell: "bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ when: upgrade_edge is defined and upgrade_edge | bool == True and http_proxy is not defined and https_proxy is not defined
- - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no proxy
- shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
- env:
- JAVA_HOME: '{{ java_home }}'
- failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
- when: apigee_stage is not defined
- register: results
-
- - name: Install bootstrap from development repositories
- shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
- env:
- JAVA_HOME: '{{ java_home }}'
- failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
- register: results
- when: apigee_stage is defined
+ - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no proxy
+ shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+ when: apigee_stage is not defined
+ register: results
when: http_proxy is not defined and https_proxy is not defined
- - block:
- - name: Update apigee-service if upgrade_edge is set as part of an upgrade
- shell: "bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
- env:
- JAVA_HOME: '{{ java_home }}'
- when: upgrade_edge is defined and upgrade_edge | bool == True
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: Install bootstrap from development repositories
+ shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+ register: results
+ when: apigee_stage is defined and http_proxy is not defined and https_proxy is not defined
- - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
- shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
- env:
- JAVA_HOME: '{{ java_home }}'
- failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
- register: results
- when: apigee_stage is not defined
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: Update apigee-service if upgrade_edge is set as part of an upgrade
+ shell: "bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ when: upgrade_edge is defined and upgrade_edge | bool == True
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ when: http_proxy is defined and https_proxy is defined
- - name: Install bootstrap from development repositories
- shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
- env:
- JAVA_HOME: '{{ java_home }}'
- failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
- register: results
- when: apigee_stage is defined
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
+ shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+ register: results
+ when: apigee_stage is not defined
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ when: http_proxy is defined and https_proxy is defined
+ - name: Install bootstrap from development repositories
+ shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+ env:
+ JAVA_HOME: '{{ java_home }}'
+ failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+ register: results
+ when: apigee_stage is defined
+ environment:
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
when: http_proxy is defined and https_proxy is defined
rescue:
