From 56d4be5c04b52bcf7168df3e20a6cb440e441969 Mon Sep 17 00:00:00 2001
From: Brett Meehan <bmeehan@atlassian.com>
Date: Wed, 20 Nov 2019 10:08:07 +1100
Subject: [PATCH] ITOPSENG-101 addresses PR comments

---
 .../tasks/jira-servicedesk_as_obr.yml               | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
index bce18c1..e602765 100644
--- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml
+++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
@@ -110,9 +110,6 @@
         src: "{{ atl_obr_download }}"
         dest: "{{ atl_obr_shared_download }}"
         remote_src: true
-      when:
-        - moving_lock_created is succeeded
-        - moving_lock_created.changed
       register: copied
 
     - name: Create completed_lock once obr downloaded and copied
@@ -150,7 +147,7 @@
 
 - name: Ensure instaled-plugins dir exists
   file:
-    path: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins"
+    path: "{{ atl_product_home_shared }}/plugins/installed-plugins"
     state: directory
     mode: 0750
     owner: "{{ atl_product_user }}"
@@ -161,8 +158,8 @@
   unarchive:
     remote_src: true
     src: "{{ atl_obr_download }}"
-    dest: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins"
-    creates: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins/jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.jar"
+    dest: "{{ atl_product_home_shared }}/plugins/installed-plugins"
+    creates: "{{ atl_product_home_shared }}/plugins/installed-plugins/jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.jar"
     list_files: no
     exclude:
       - M*
@@ -173,5 +170,5 @@
 
 - name: Move JSD dependency jars into the installed-plugins dir
   shell:
-    cmd: "mv {{ atl_product_version_cache_dir }}/plugins/installed-plugins/dependencies/*.jar {{ atl_product_version_cache_dir }}/plugins/installed-plugins"
-    creates: "{{ atl_product_version_cache_dir }}/plugins/installed-plugins/servicedesk-core-ui-plugin-{{ atl_jsd_build_info.json.name }}-REL-0022.jar"
+    cmd: "mv {{ atl_product_home_shared }}/plugins/installed-plugins/dependencies/*.jar {{ atl_product_home_shared }}/plugins/installed-plugins"
+    creates: "{{ atl_product_home_shared }}/plugins/installed-plugins/servicedesk-core-ui-plugin-{{ atl_jsd_build_info.json.name }}-*.jar"