X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=rpmbuild.spec;h=ee48aa29dd51f3177437008471feda50008b557f;hb=9597c8d8f851e9c5ac89715947383d16e2ce41b0;hp=d4153a37cf98594c89bcdd6836eac60e15550592;hpb=6dbd13e1f66855847fe66d1fa36bb5a40e7258fe;p=ta%2Fcaas-lcm.git

diff --git a/rpmbuild.spec b/rpmbuild.spec
index d4153a3..ee48aa2 100644
--- a/rpmbuild.spec
+++ b/rpmbuild.spec
@@ -15,18 +15,17 @@
 %define COMPONENT lcm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 5
+%define RPM_MINOR_VERSION 9
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
-%define LCM_PATH /opt/caas_lcm
-%define DEPLOY_PATH %{LCM_PATH}/deploy
-%define SU_PATH %{LCM_PATH}/su
+%define DEPLOY_PATH %{_caas_lcm_path}/deploy
+%define SU_PATH %{_caas_lcm_path}/su
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
 Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service Life Cycle Managemnet workflows
 License:        %{_platform_license}
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor}
 Source0:        %{name}-%{version}.tar.gz
 
@@ -54,13 +53,13 @@ mkdir -p %{buildroot}/%{_roles_path}/
 rsync -av ansible/roles/pre_config_lcm %{buildroot}/%{_roles_path}/
 
 # ------- set lcm path inside deploy
-sed -i 's|{{ lcm_path }}|%{LCM_PATH}|g' %{buildroot}/%{DEPLOY_PATH}/roles/bm_onboard/tasks/main.yml
-sed -i 's|{{ lcm_path }}|%{LCM_PATH}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_application_deployments/tasks/main.yml
-sed -i 's|{{ lcm_path }}|%{LCM_PATH}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_application_packages/tasks/main.yml
-sed -i 's|{{ lcm_path }}|%{LCM_PATH}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_docker_images/tasks/main.yml
+sed -i 's|{{ lcm_path }}|%{_caas_lcm_path}|g' %{buildroot}/%{DEPLOY_PATH}/roles/bm_onboard/tasks/main.yml
+sed -i 's|{{ lcm_path }}|%{_caas_lcm_path}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_application_deployments/tasks/main.yml
+sed -i 's|{{ lcm_path }}|%{_caas_lcm_path}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_application_packages/tasks/main.yml
+sed -i 's|{{ lcm_path }}|%{_caas_lcm_path}|g' %{buildroot}/%{DEPLOY_PATH}/roles/list_docker_images/tasks/main.yml
 sed -i 's|{{ caas_manifest_path }}|%{_caas_manifest_path}|g' %{buildroot}/%{DEPLOY_PATH}/group_vars/controller-1.caas_master/params.yml
 # ------- set lcm path inside roles
-sed -i 's|{{ lcm_path }}|%{LCM_PATH}|g' %{buildroot}/%{_roles_path}/pre_config_lcm/tasks/main.yml
+sed -i 's|{{ lcm_path }}|%{_caas_lcm_path}|g' %{buildroot}/%{_roles_path}/pre_config_lcm/tasks/main.yml
 # -------
 
 %files