updated logic
diff --git a/tasks/main.yml b/tasks/main.yml index 4f8d22c..ef00d82 100644 --- a/tasks/main.yml +++ b/tasks/main.yml
@@ -1,25 +1,25 @@ --- # tasks file for apigee-opdk-setup-component -- block: +#- block: - - name: Use no proxy definitions - include: with_no_proxy.yml - when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined +- name: Use no proxy definitions + include: with_no_proxy.yml + when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined - - name: Use proxy definitions - include: with_proxy.yml - when: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined +- name: Use proxy definitions + include: with_proxy.yml + when: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined - rescue: +# rescue: +# +# - name: Validate status failed, trying component start... +# command: '{{ apigee_all }} start' +# when: opdk_version | version_compare('4.16.01', '>=') - - name: Validate status failed, trying component start... - command: '{{ apigee_all }} start' - when: opdk_version | version_compare('4.16.01', '>=') - - - name: Wait for ready - ignore_errors: "{{ ignore_errors | default('no') }}" - command: '{{ apigee_all }} wait_for_ready' - when: validate_ready | default(true) +- name: Wait for ready + ignore_errors: "{{ ignore_errors | default('no') }}" + command: '{{ apigee_all }} wait_for_ready' + when: validate_ready | default(true) - name: Validate component status command: '{{ apigee_all }} status'
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml index e5f3c1d..448d515 100644 --- a/tasks/with_no_proxy.yml +++ b/tasks/with_no_proxy.yml
@@ -2,12 +2,12 @@ - name: Install Apigee component for version {{ opdk_version }} or greater with no proxy - {{ profile }} command: '{{ apigee_setup }} -p {{ profile }} -f {{ opdk_installation_config_file }}' when: opdk_version | version_compare('4.16.01', '>=') - register: result - -- name: Installation with no proxy failed - fail: - msg: "Apigee Component failed" - when: result | failed +# register: result +# +#- name: Installation with no proxy failed +# fail: +# msg: "Apigee Component failed" +# when: result | failed - name: Wait for ready with no proxy command: '{{ apigee_all }} wait_for_ready'
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml index 5ef1b8b..d2f5027 100644 --- a/tasks/with_proxy.yml +++ b/tasks/with_proxy.yml
@@ -6,12 +6,12 @@ http_proxy: "{{ http_proxy }}" https_proxy: "{{ https_proxy }}" no_proxy: "{{ no_proxy }}" - register: result +# register: result -- name: Installation with proxy failed - fail: - msg: "Apigee Component failed" - when: result.failed is defined and result.failed | bool +#- name: Installation with proxy failed +# fail: +# msg: "Apigee Component failed" +# when: result.failed is defined and result.failed | bool - name: Wait for ready with no proxy command: '{{ apigee_all }} wait_for_ready'