updated template
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/online/install-bootstrap-with-proxy.yml
index 91dc3c4..f8fa4c9 100644
--- a/tasks/online/install-bootstrap-with-proxy.yml
+++ b/tasks/online/install-bootstrap-with-proxy.yml
@@ -1,76 +1,82 @@
---
-- name: Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
- 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 opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+- block:
+ - name: Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
+ 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 opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
-- name: DEBUG_MODE - Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
- shell: "bash -x {{ 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 opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: DEBUG_MODE - Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
+ shell: "bash -x {{ 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 opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ when: (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0)
-- 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 | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_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 and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+- block:
+ - 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 | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_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 and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
-- name: DEBUG_MODE - Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
- shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_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 and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: DEBUG_MODE - Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
+ shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_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 and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ when: (apigee_repo_uri is defined and apigee_repo_uri | trim | length > 0)
-- name: Install bootstrap from development repositories with proxy
- shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_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 opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+- block:
+ - name: Install bootstrap from development repositories with proxy
+ shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_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 opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
-- name: DEBUG_MODE - Install bootstrap from development repositories with proxy
- shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
- args:
- creates: '{{ apigee_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 opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
- environment:
- no_proxy: "{{ no_proxy }}"
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
+ - name: DEBUG_MODE - Install bootstrap from development repositories with proxy
+ shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+ args:
+ creates: '{{ apigee_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 opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+ environment:
+ no_proxy: "{{ no_proxy }}"
+ http_proxy: "{{ http_proxy }}"
+ https_proxy: "{{ https_proxy }}"
+ when: apigee_stage is defined or apigee_stage | trim | length > 0
\ No newline at end of file
