From c040bd5a76c59490e12f9184986d4176ec3f952c Mon Sep 17 00:00:00 2001 From: Pedro Almeida Date: Tue, 7 Jun 2022 16:59:17 -0300 Subject: [PATCH] First update on image customization Following the openstack transition to Debian, this aims to start the creation of the debian docker image files, adapting the customization to proper enable WSGI on Debian. Since we are not currently building Openstack on debian yet, this won't have any effect on our current build/testing. Also, since these images use apache, there's a change which is yet to be done on the stx-openstack-helm manifest to user the "www-data" socket-user insetad of "apache", since the latter one is for centos only. Test Plan: PASS: Build horizon and placement images using a debian base image PASS: Override both images on a working Openstack application PASS: Access the horizon interface PASS: Remove and apply Openstack Story: 2010072 Task: 45558 Signed-off-by: Pedro Almeida Change-Id: I776e03b863056fbb068e2eca0637e9c8b64b4b0c --- .../debian/stx-horizon.dev_docker_image | 14 ++++++++++++++ .../debian/stx-horizon.stable_docker_image | 15 +++++++++++++++ .../debian/stx-placement.dev_docker_image | 10 ++++++++++ .../debian/stx-placement.stable_docker_image | 11 +++++++++++ 4 files changed, 50 insertions(+) create mode 100644 openstack/python-horizon/debian/stx-horizon.dev_docker_image create mode 100644 openstack/python-horizon/debian/stx-horizon.stable_docker_image create mode 100644 openstack/python-placement/debian/stx-placement.dev_docker_image create mode 100644 openstack/python-placement/debian/stx-placement.stable_docker_image diff --git a/openstack/python-horizon/debian/stx-horizon.dev_docker_image b/openstack/python-horizon/debian/stx-horizon.dev_docker_image new file mode 100644 index 00000000..ac08b8b4 --- /dev/null +++ b/openstack/python-horizon/debian/stx-horizon.dev_docker_image @@ -0,0 +1,14 @@ +BUILDER=loci +LABEL=stx-horizon +PROJECT=horizon +PROJECT_REPO=https://opendev.org/openstack/horizon.git +PIP_PACKAGES="pycryptodomex python-ceilometerclient \ + coverage pyudev ldap" +PROFILES="fluent horizon apache" +CUSTOMIZATION="\ + ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \ + ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf && \ + ln -s /bin/true /usr/bin/a2enmod && \ + sed -i -e 's/raise ImproperlyConfigured..mysqlclient 1.3.13 or newer is required.*/pass/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/base.py && \ + sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/operations.py +" diff --git a/openstack/python-horizon/debian/stx-horizon.stable_docker_image b/openstack/python-horizon/debian/stx-horizon.stable_docker_image new file mode 100644 index 00000000..d5d7d732 --- /dev/null +++ b/openstack/python-horizon/debian/stx-horizon.stable_docker_image @@ -0,0 +1,15 @@ +BUILDER=loci +LABEL=stx-horizon +PROJECT=horizon +PROJECT_REPO=https://opendev.org/openstack/horizon.git +PROJECT_REF=stable/ussuri +PIP_PACKAGES="pycryptodomex python-ceilometerclient \ + coverage pyudev ldap" +PROFILES="fluent horizon apache" +CUSTOMIZATION="\ + ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \ + ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf && \ + ln -s /bin/true /usr/bin/a2enmod && \ + sed -i -e 's/raise ImproperlyConfigured..mysqlclient 1.3.13 or newer is required.*/pass/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/base.py && \ + sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/operations.py +" diff --git a/openstack/python-placement/debian/stx-placement.dev_docker_image b/openstack/python-placement/debian/stx-placement.dev_docker_image new file mode 100644 index 00000000..21486531 --- /dev/null +++ b/openstack/python-placement/debian/stx-placement.dev_docker_image @@ -0,0 +1,10 @@ +BUILDER=loci +LABEL=stx-placement +PROJECT=placement +PROJECT_REPO=https://opendev.org/openstack/placement.git +PIP_PACKAGES="pycryptodomex httplib2" +PROFILES="apache" +CUSTOMIZATION="\ + ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \ + ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf +" diff --git a/openstack/python-placement/debian/stx-placement.stable_docker_image b/openstack/python-placement/debian/stx-placement.stable_docker_image new file mode 100644 index 00000000..c0cb73ec --- /dev/null +++ b/openstack/python-placement/debian/stx-placement.stable_docker_image @@ -0,0 +1,11 @@ +BUILDER=loci +LABEL=stx-placement +PROJECT=placement +PROJECT_REPO=https://opendev.org/openstack/placement.git +PROJECT_REF=stable/ussuri +PIP_PACKAGES="pycryptodomex httplib2" +PROFILES="apache" +CUSTOMIZATION="\ + ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \ + ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf +"