From 47cb955cbb7b56646403d790a5f828dffe3a972b Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Mon, 25 Jul 2022 13:13:24 +1000 Subject: [PATCH] changing file mode, going back to moving the dependency jars since unarchive -j brings other problems --- .../tasks/jira-servicedesk_as_obr.yml | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml index 6d5af31..73e7c3b 100644 --- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml +++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml @@ -235,23 +235,18 @@ - obr.xml owner: "{{ atl_product_user }}" group: "{{ atl_product_user }}" - mode: 0750 - extra_opts: [-j] # pass the junk paths to the unzip command so we flatten the dependencies directory + mode: 0644 register: obr_unpack - failed_when: # validation doesn't handle the -j flag, so this deals with the /dependencies/ directory not existing on dest. - - obr_unpack.rc > 0 - - "'Unexpected error when accessing exploded file' not in obr_unpack.msg" - - "'No such file or directory' not in obr_unpack.msg" - - "'{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/dependencies/' not in obr_unpack.msg" -# - name: Move JSD dependency jars into the installed-plugins dir # noqa 503 - ignore lint info about when changed -# copy: -# src: "{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/dependencies/" -# dest: "{{ atl_product_home_shared }}/plugins/installed-plugins/" -# when: obr_unpack.changed +- name: Move JSD dependency jars into the bundled-plugins dir # noqa 503 - ignore lint info about when changed + copy: + remote_src: yes + src: "{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/dependencies/" + dest: "{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/" + when: obr_unpack.changed -# - name: Remove the empty dependencies folder # noqa 503 - ignore lint info about when changed -# file: -# path: "{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/dependencies" -# state: absent -# when: obr_unpack.changed \ No newline at end of file +- name: Remove the empty dependencies folder # noqa 503 - ignore lint info about when changed + file: + path: "{{ atl_product_installation_versioned }}/atlassian-jira/WEB-INF/atlassian-bundled-plugins/dependencies" + state: absent + when: obr_unpack.changed \ No newline at end of file