Merge "Ensure stx-openstack tarball builds on Debian"

python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install

@@ -1 +1 @@
-plugins/k8sapp-openstack/*.whl
+plugins/*.whl

python-k8sapp-openstack/debian/deb_folder/rules

@@ -14,7 +14,7 @@ override_dh_auto_install:
 	python3 setup.py install --install-layout=deb --root $(ROOT)
 	python3 setup.py bdist_wheel \
 		--universal \
-		-d $(ROOT)/plugins/$(APP_NAME)
+		-d $(ROOT)/plugins
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3

stx-openstack-helm-fluxcd/debian/deb_folder/control

@@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
 Package: stx-openstack-helm-fluxcd
 Section: libs
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+ openstack-helm-infra,
+ openstack-helm,
+ python3-k8sapp-openstack-wheels
 Description: StarlingX Openstack FluxCD application
  This package contains the components needed for the Openstack FluxCD
  application.

stx-openstack-helm/debian/deb_folder/control

@@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
 Package: stx-openstack-helm
 Section: libs
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+ openstack-helm-infra,
+ openstack-helm,
+ python3-k8sapp-openstack-wheels
 Description: StarlingX Openstack Armada Helm Charts
  This package contains Armada helm charts for the Openstack armada
  application.