f7f7690444
In preparation for the STX-Openstack upversion to ANTELOPE, there's a need to decouple the Openstack packages from the Platform ones, so that the development can occur without impacting the current version. This decoupling allows the platform and applications to leverage different versions of OpenStack releases for their respective packages. On this upversion process, we can't upversion one package at a time, since that would certainly break the build, testing and usage of StarlingX. We need to have a way in which the development of STX-O can occur without impacting the rest of the platform. To achieve this, a new folder named "openstack" has been created under the openstack-armada-app repo, containing all packages from the upstream repository, under the openstack folder [1]. This ensures that the ongoing upversion process does not disrupt the platform's functionalities and prevents any potential breakages during the transition. It should be noted that this change only serves as a placeholder for future upversions and does not impact the current packages, as they're not going to be delivered to the ISO, or the STX-O Helm charts, until the upversion is completed. This commit lays the groundwork for future work on the STX-O upversion, promoting flexibility and modularization within the StarlingX packages. The SRC_DIR and the BASE_SRCREV were updated for each package in order for the build to work. The BASE_SRCREV was set to the latest merged change by the time that this review was created [2] After the work on the upversion and the STX-O clients containerization is done, the 48138 task (under this same story) can be worked on to completely remove the STX-O clients from the platform. [1] https://opendev.org/starlingx/upstream/src/branch/master/openstack [2] https://review.opendev.org/c/starlingx/openstack-armada-app/+/885301 Test Plan: PASS: Make sure that the packages are not found if they're commented on the debian_pkg_dirs file PASS: Make sure that the images are not found if they're commented on the debian_stable_docker_images.inc PASS: Make sure packages can be build: - openstack-pkg-tools - rabbitmq-server - python-wsme - openstack-ras - python-openstacksdk - python-oslo-messaging - python-osc-lib - barbican - keystone - horizon - python-aodhclient - python-barbicanclient - python-cinderclient - python-glanceclient - python-gnocchiclient - python-heatclient - python-ironicclient - python-keystoneclient - python-neutronclient - python-novaclient - python-openstackclient - python-pankoclient PASS: Make sure images can be build: - stx-aodh - stx-ironic - stx-barbican - stx-ceilometer - stx-cinder - stx-glance - stx-gnocchi - stx-heat - stx-horizon - stx-keystone - stx-neutron - stx-nova - stx-openstackclients - stx-placement - stx-platformclients Story: 2010774 Task: 48115 Change-Id: I077a814382fb21bd4b36fac7c20ee041718433f3 Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
From 2410e5ae2150100c7a4c01886498935c57076822 Mon Sep 17 00:00:00 2001
|
|
From: Fabricio Henrique Ramos <fabriciohenrique.ramos@windriver.com>
|
|
Date: Fri, 22 Oct 2021 14:11:23 -0300
|
|
Subject: [PATCH] install extra files
|
|
|
|
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
|
|
---
|
|
debian/openstack-dashboard.install | 8 ++++++++
|
|
debian/python3-django-horizon.install | 1 +
|
|
debian/rules | 10 ++++++++++
|
|
3 files changed, 19 insertions(+)
|
|
|
|
diff --git a/debian/openstack-dashboard.install b/debian/openstack-dashboard.install
|
|
index 2be73b9..12f33b9 100644
|
|
--- a/debian/openstack-dashboard.install
|
|
+++ b/debian/openstack-dashboard.install
|
|
@@ -1,3 +1,11 @@
|
|
debian/local_settings.d/* usr/share/openstack-dashboard-debian-settings.d
|
|
etc/openstack-dashboard
|
|
+etc/httpd/conf.d/openstack-dashboard.conf
|
|
+etc/logrotate.d/openstack-dashboard
|
|
+etc/rc.d/init.d/horizon
|
|
usr/share/openstack-dashboard
|
|
+usr/share/openstack-dashboard/guni_config.py
|
|
+usr/bin/horizon-clearsessions
|
|
+usr/bin/horizon-patching-restart
|
|
+usr/bin/horizon-assets-compress
|
|
+usr/lib/systemd/system/httpd.service.d/openstack-dashboard.conf
|
|
diff --git a/debian/python3-django-horizon.install b/debian/python3-django-horizon.install
|
|
index 47e0ed4..a113003 100644
|
|
--- a/debian/python3-django-horizon.install
|
|
+++ b/debian/python3-django-horizon.install
|
|
@@ -1 +1,2 @@
|
|
/usr/lib/python*
|
|
+usr/share/doc/python3-django-horizon/openstack-dashboard-httpd-logging.conf
|
|
diff --git a/debian/rules b/debian/rules
|
|
index 53181a6..4ab08e7 100755
|
|
--- a/debian/rules
|
|
+++ b/debian/rules
|
|
@@ -95,6 +95,16 @@ override_dh_auto_install:
|
|
## Delete not needed files
|
|
rm -f $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/openstack_dashboard/local/_build*.lock
|
|
|
|
+ install -D -p -m 644 $(CURDIR)/openstack-dashboard-httpd-2.4.conf $(CURDIR)/debian/tmp/etc/httpd/conf.d/openstack-dashboard.conf
|
|
+ install -D -p -m 644 $(CURDIR)/python-django-horizon-systemd.conf $(CURDIR)/debian/tmp/usr/lib/systemd/system/httpd.service.d/openstack-dashboard.conf
|
|
+ install -D -p $(CURDIR)/openstack-dashboard-httpd-logging.conf $(CURDIR)/debian/tmp/usr/share/doc/python3-django-horizon/openstack-dashboard-httpd-logging.conf
|
|
+ install -D -p $(CURDIR)/python-django-horizon-logrotate.conf $(CURDIR)/debian/tmp/etc/logrotate.d/openstack-dashboard
|
|
+ install -D -p -m 755 $(CURDIR)/horizon.init $(CURDIR)/debian/tmp/etc/rc.d/init.d/horizon
|
|
+ install -D -p -m 755 $(CURDIR)/horizon-clearsessions $(CURDIR)/debian/tmp/usr/bin/horizon-clearsessions
|
|
+ install -D -p -m 755 $(CURDIR)/horizon-patching-restart $(CURDIR)/debian/tmp/usr/bin/horizon-patching-restart
|
|
+ install -D -p $(CURDIR)/guni_config.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/guni_config.py
|
|
+ install -D -p -m 755 $(CURDIR)/horizon-assets-compress $(CURDIR)/debian/tmp/usr/bin/horizon-assets-compress
|
|
+
|
|
dh_install
|
|
dh_missing --fail-missing
|
|
find $(CURDIR)/debian -iname .eslintrc -delete
|
|
--
|
|
2.25.1
|
|
|