Repair build process for package stx-openstack-helm.

Relocation of helm charts required some modifications to
the spec and relocation of the makefile..

Story: 2006166
Task: 35687
Depends-On: I5c34bf66a3631e86e22684412e01c02980e9ae30
Change-Id: If27d138708c580df168797a3878e349fde2c6d19
Signed-off-by: Scott Little <scott.little@windriver.com>

stx-openstack-helm/centos/build_srpm.data

@@ -1,6 +1,8 @@
 SRC_DIR="stx-openstack-helm"
-COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/garbd \
-    $PKG_BASE/../../../helm-charts/nginx-ports-control"
+COPY_LIST_TO_TAR="\
+    $STX_BASE/helm-charts/fm-rest-api/fm-rest-api/helm-charts \
+"
+
 # This version is used as a component of the stx-openstack application
 # version. Any change to this version must also be reflected in the
 # SUPPORTED_VERSIONS list in sysinv/helm/openstack_version_check.py

stx-openstack-helm/centos/stx-openstack-helm.spec

@@ -57,11 +57,13 @@ helm repo rm local
 helm repo add local http://localhost:8879/charts
 
 # Make the charts. These produce a tgz file
+cd helm-charts
 make nova-api-proxy
 make garbd
 make keystone-api-proxy
 make fm-rest-api
 make nginx-ports-control
+cd -
 
 # terminate helm server (the last backgrounded task)
 kill %1
@@ -74,7 +76,7 @@ rm  ./helm-toolkit-%{toolkit_version}.tgz
 install -d -m 755 ${RPM_BUILD_ROOT}%{app_folder}
 install -p -D -m 755 files/metadata.yaml ${RPM_BUILD_ROOT}%{app_folder}
 install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
-install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
+install -p -D -m 755 helm-charts/*.tgz ${RPM_BUILD_ROOT}%{helm_folder}
 install -d -m 755 ${RPM_BUILD_ROOT}%{armada_folder}
 install -p -D -m 755 manifests/*.yaml ${RPM_BUILD_ROOT}%{armada_folder}