bm onboard fix part2

Signed-off-by: Endre Nemeth <endre.nemeth@nokia.com>
Change-Id: I15346ff24deb5a676bd71b765da04a2e42e5300d

diff --git a/rpmbuild.spec b/rpmbuild.spec
index d76238d..d4153a3 100644 (file)
--- a/rpmbuild.spec
+++ b/rpmbuild.spec
@@ -15,7 +15,7 @@
 %define COMPONENT lcm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define LCM_PATH /opt/caas_lcm
 %define DEPLOY_PATH %{LCM_PATH}/deploy

diff --git a/su/roles/su_prepare/tasks/merge-images.yml b/su/roles/su_prepare/tasks/merge-images.yml
index 4d7a922..bc176dc 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: "{{ 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 }}"
+  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 }}\""