Updated proxy usage and attributes
diff --git a/tasks/install-online.yml b/tasks/install-online.yml
index e831305..879a3c4 100644
--- a/tasks/install-online.yml
+++ b/tasks/install-online.yml
@@ -5,13 +5,26 @@
owner: "{{ opdk_user_name }}"
group: "{{ opdk_group_name }}"
-- name: Download bootstrap with no proxy
- include_tasks: online/download-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 == '')
+#- name: Download bootstrap with no proxy
+# include_tasks: online/download-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 == '')
+#
+#- name: Download bootstrap with proxy
+# include_tasks: online/download-bootstrap-with-proxy.yml
+# when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
- name: Download bootstrap with proxy
- include_tasks: online/download-bootstrap-with-proxy.yml
- when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+ 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 }}"
- name: Bootstrap script exists
stat:
@@ -33,8 +46,8 @@
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-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 != ''
@@ -43,8 +56,8 @@
- 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-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 != ''
diff --git a/tasks/online/download-bootstrap-with-proxy.yml b/tasks/online/download-bootstrap-with-proxy.yml
index a303416..4606cd2 100644
--- a/tasks/online/download-bootstrap-with-proxy.yml
+++ b/tasks/online/download-bootstrap-with-proxy.yml
@@ -5,8 +5,8 @@
dest_dir: '{{ opdk_installer_path }}'
version: '{{ opdk_version }}'
url: '{{ apigee_repo_url | default(default_apigee_repo_url) }}'
- user_name: '{{ apigee_repo_user }}'
- password: '{{ apigee_repo_password }}'
+ 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 }}"
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/online/install-bootstrap-with-proxy.yml
index f8fa4c9..33a5943 100644
--- a/tasks/online/install-bootstrap-with-proxy.yml
+++ b/tasks/online/install-bootstrap-with-proxy.yml
@@ -79,4 +79,4 @@
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
+ when: apigee_stage is defined or apigee_stage | trim | length > 0
