Remove hardcoded script path

Change-Id: I583885341e4c14173430160e13f6bc94c26776f8
Depends-On: I2969223948218155aff121c20731eb336c13fca6
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>

diff --git a/.gitreview b/.gitreview
new file mode 100644 (file)
index 0000000..74a5cf4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.akraino.org
+port=29418
+project=ta/caas-lcm
+defaultremote=origin

diff --git a/su/roles/su_prepare/tasks/merge-images.yml b/su/roles/su_prepare/tasks/merge-images.yml
index 3a0abc9..55a3880 100644 (file)
--- a/su/roles/su_prepare/tasks/merge-images.yml
+++ b/su/roles/su_prepare/tasks/merge-images.yml
@@ -19,4 +19,4 @@
 
 # Tags may different between images. So we get tag for each image in script.
 - name: Merge new images to original registry
-  shell: /usr/libexec/nokia/merge_image.sh --from-registry={{ caas.update_registry_url }}:{{ caas.update_registry_port }} --to-registry={{ caas.registry_url }}:{{ caas.registry_port }} "{{ ret_repo_in_new_registry.stdout }}"
+  shell: {{ caas.libexec_dir }}/merge_image.sh --from-registry={{ caas.update_registry_url }}:{{ caas.update_registry_port }} --to-registry={{ caas.registry_url }}:{{ caas.registry_port }} "{{ ret_repo_in_new_registry.stdout }}"