manifests_directory variable corrected

Change-Id: Ia5b812595010a07d5dd1dc747d599fe08a3ff323

diff --git a/rpmbuild.spec b/rpmbuild.spec
index d4153a3..cc90b11 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 5
+%define RPM_MINOR_VERSION 6
 %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 834b9bb..a0f0170 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
-      shell: kubectl delete -f {{ manifests_directory }}/{{item}}
+      shell: kubectl delete -f {{ caas.manifests_directory }}/{{item}}
       with_items:
         - update_registry_service.yml
         - docker-registry-update.yml

diff --git a/su/tasks/start_vnfc.yml b/su/tasks/start_vnfc.yml
index ffea7de..6270c9c 100644 (file)
--- a/su/tasks/start_vnfc.yml
+++ b/su/tasks/start_vnfc.yml
@@ -15,7 +15,7 @@
 
 - block:
     - name: "create vnfcs"
-      command: "/bin/kubectl create -f {{ manifests_directory }}/{{ item }}.yml"
+      command: "/bin/kubectl create -f {{ caas.manifests_directory }}/{{ item }}.yml"
       with_items: "{{ vnfcs }}"      
       register: out
       until: out|succeeded or (out.stderr.find('already exists') != -1)