clean up bootstrap
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/install-bootstrap-with-proxy.yml
similarity index 100%
rename from tasks/online/install-bootstrap-with-proxy.yml
rename to tasks/install-bootstrap-with-proxy.yml
diff --git a/tasks/install-online.yml b/tasks/install-online.yml
index 57b20b5..d2511f3 100644
--- a/tasks/install-online.yml
+++ b/tasks/install-online.yml
@@ -40,19 +40,11 @@
shell: "yum clean all"
- block:
-# - include_tasks: online/install-bootstrap-with-no-proxy.yml
-# when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
-
- - include_tasks: online/install-bootstrap-with-proxy.yml
-# when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+ - include_tasks: install-bootstrap-with-proxy.yml
rescue:
- name: Yum failed to update, let's clean yum
shell: 'yum clean all'
-# - include_tasks: online/install-bootstrap-with-no-proxy.yml
-# when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
-
- - include_tasks: online/install-bootstrap-with-proxy.yml
-# when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+ - include_tasks: install-bootstrap-with-proxy.yml
become: yes
diff --git a/tasks/online/download-bootstrap-with-no-proxy.yml b/tasks/online/download-bootstrap-with-no-proxy.yml
deleted file mode 100644
index 58ab5a1..0000000
--- a/tasks/online/download-bootstrap-with-no-proxy.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Download bootstrap with no proxy
- become: yes
- bootstrap:
- dest_dir: '{{ opdk_installer_path }}'
- version: '{{ opdk_version }}'
- url: '{{ apigee_repo_url | default(default_apigee_repo_url) }}'
- user_name: '{{ apigee_repo_user | default(default_apigee_repo_user) }}'
- password: '{{ apigee_repo_password | default(default_apigee_repo_password) }}'
- register: results
-
diff --git a/tasks/online/download-bootstrap-with-proxy.yml b/tasks/online/download-bootstrap-with-proxy.yml
deleted file mode 100644
index 4606cd2..0000000
--- a/tasks/online/download-bootstrap-with-proxy.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Download bootstrap with proxy
- become: yes
- bootstrap:
- dest_dir: '{{ opdk_installer_path }}'
- version: '{{ opdk_version }}'
- url: '{{ apigee_repo_url | default(default_apigee_repo_url) }}'
- user_name: '{{ apigee_repo_user | default(default_apigee_repo_user) }}'
- password: '{{ apigee_repo_password | default(default_apigee_repo_password) }}'
- register: results
- environment:
- http_proxy: "{{ http_proxy }}"
- https_proxy: "{{ https_proxy }}"
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
deleted file mode 100644
index ea5da89..0000000
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- 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 and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
-
- - name: DEBUG_MODE - Update apigee-service if upgrade_edge is set as part of an upgrade
- 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'
- when: (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0)
-
-- block:
- - 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 | 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
- when: apigee_stage is not defined and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
- register: results
-
- - name: DEBUG_MODE - Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no 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
- when: apigee_stage is not defined and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
- register: results
- when: (apigee_repo_uri is defined and apigee_repo_uri | trim | length > 0)
-
-- block:
- - name: Install bootstrap from development repositories with no 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'
-
- - name: DEBUG_MODE - Install bootstrap from development repositories with no 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'
- when: apigee_stage is defined or apigee_stage | trim | length > 0
\ No newline at end of file
