bm onboard fix

Change-Id: Ib733af60fa50d87a1f9d22f1eb8f778b635768e0

diff --git a/rpmbuild.spec b/rpmbuild.spec
index c58da15..d76238d 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 COMPONENT lcm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0

-%define RPM_MINOR_VERSION 3
+%define RPM_MINOR_VERSION 4

 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define LCM_PATH /opt/caas_lcm
 %define DEPLOY_PATH %{LCM_PATH}/deploy
 %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/main.yml b/su/roles/su_prepare/tasks/main.yml
index bb18342..834b9bb 100644 (file)
--- a/su/roles/su_prepare/tasks/main.yml
+++ b/su/roles/su_prepare/tasks/main.yml
@@ -114,7 +114,7 @@
         path: /tmp/su_chart
 
     - name: Delete the registry and swift for su
         path: /tmp/su_chart
 
     - name: Delete the registry and swift for su

-      shell: kubectl delete -f /var/lib/caas/manifests/{{item}}
+      shell: kubectl delete -f {{ manifests_directory }}/{{item}}

       with_items:
         - update_registry_service.yml
         - docker-registry-update.yml
       with_items:
         - update_registry_service.yml
         - docker-registry-update.yml

diff --git a/su/roles/su_prepare/tasks/merge-images.yml b/su/roles/su_prepare/tasks/merge-images.yml
index 55a3880..4d7a922 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
 
 # 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 }}"

diff --git a/su/tasks/start_vnfc.yml b/su/tasks/start_vnfc.yml
index afaffe7..ffea7de 100644 (file)
--- a/su/tasks/start_vnfc.yml
+++ b/su/tasks/start_vnfc.yml
@@ -15,7 +15,7 @@
 
 - block:
     - name: "create vnfcs"
 
 - block:
     - name: "create vnfcs"

-      command: "/bin/kubectl create -f /var/lib/caas/manifests/{{ item }}.yml"
+      command: "/bin/kubectl create -f {{ manifests_directory }}/{{ item }}.yml"

       with_items: "{{ vnfcs }}"      
       register: out
       until: out|succeeded or (out.stderr.find('already exists') != -1)
       with_items: "{{ vnfcs }}"      
       register: out
       until: out|succeeded or (out.stderr.find('already exists') != -1)