Merge "Port stx-openstack images with WSGI to stx-debian"

debian_stable_docker_images.inc

@@ -1,9 +1,15 @@
+openstack/openstack-aodh
+openstack/openstack-ironic
 openstack/python-barbican
 openstack/python-ceilometer
 openstack/python-cinder
 openstack/python-glance
+openstack/python-gnocchi
 openstack/python-heat/openstack-heat
+openstack/python-horizon
+openstack/python-keystone
 openstack/python-neutron
 openstack/python-nova
 openstack/python-openstackclient
+openstack/python-placement
 openstack/python-platformclients

openstack/openstack-aodh/debian/stx-aodh.stable_docker_image

@@ -0,0 +1,14 @@
+BUILDER=loci
+LABEL=stx-aodh
+PROJECT=aodh
+PROJECT_REPO=https://opendev.org/openstack/aodh.git
+PROJECT_REF=stable/ussuri
+PROJECT_UID=42425
+PROJECT_GID=42425
+PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
+DIST_REPOS="OS"
+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
+"

openstack/openstack-ironic/debian/stx-ironic.stable_docker_image

@@ -0,0 +1,16 @@
+BUILDER=loci
+LABEL=stx-ironic
+PROJECT=ironic
+PROJECT_REPO=https://opendev.org/openstack/ironic.git
+PROJECT_REF=stable/ussuri
+PROJECT_UID=42425
+PROJECT_GID=42425
+PIP_PACKAGES="pylint alembic pysnmp"
+DIST_REPOS="OS"
+DIST_PACKAGES="ipxe tftpd-hpa openipmi ipmitool iproute2 qemu-utils syslinux-common open-iscsi"
+PROFILES="ironic 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
+"
+UPDATE_SYSTEM_ACCOUNT="yes"

openstack/python-gnocchi/debian/stx-gnocchi.stable_docker_image

@@ -0,0 +1,15 @@
+BUILDER=loci
+LABEL=stx-gnocchi
+PROJECT=gnocchi
+PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
+PROJECT_REF=4.3.2
+PROJECT_UID=42425
+PROJECT_GID=42425
+PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
+DIST_REPOS="OS"
+DIST_PACKAGES="python3-rados"
+PROFILES="gnocchi 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
+"

openstack/python-horizon/debian/stx-horizon.dev_docker_image

@@ -2,13 +2,17 @@ BUILDER=loci
 LABEL=stx-horizon
 PROJECT=horizon
 PROJECT_REPO=https://opendev.org/openstack/horizon.git
+PROJECT_UID=42425
+PROJECT_GID=42425
 PIP_PACKAGES="pycryptodomex python-ceilometerclient \
               coverage pyudev ldap"
+DIST_REPOS="OS"
 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
+    sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/operations.py && \
+    sed -i 's/Listen 80/# Listen 80/' /etc/apache2/ports.conf
 "

openstack/python-horizon/debian/stx-horizon.stable_docker_image

@@ -3,13 +3,17 @@ LABEL=stx-horizon
 PROJECT=horizon
 PROJECT_REPO=https://opendev.org/openstack/horizon.git
 PROJECT_REF=stable/ussuri
+PROJECT_UID=42425
+PROJECT_GID=42425
 PIP_PACKAGES="pycryptodomex python-ceilometerclient \
               coverage pyudev ldap"
+DIST_REPOS="OS"
 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
+    sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.9/site-packages/django/db/backends/mysql/operations.py && \
+    sed -i 's/Listen 80/# Listen 80/' /etc/apache2/ports.conf
 "

openstack/python-keystone/debian/stx-keystone.stable_docker_image

@@ -0,0 +1,14 @@
+BUILDER=loci
+LABEL=stx-keystone
+PROJECT=keystone
+PROJECT_REPO=https://opendev.org/openstack/keystone.git
+PROJECT_REF=stable/ussuri
+PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
+DIST_REPOS="OS"
+PROFILES="fluent 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 && \
+    sed -i \"s/getattr(base64, 'decodebytes', base64.decodestring)/getattr(base64, 'decodebytes')/g\" /var/lib/openstack/lib/python3.9/site-packages/saml2/saml.py && \
+    sed -i \"s/getattr(base64, 'encodebytes', base64.encodestring)/getattr(base64, 'encodebytes')/g\" /var/lib/openstack/lib/python3.9/site-packages/saml2/saml.py
+"

openstack/python-placement/debian/stx-placement.dev_docker_image

@@ -2,7 +2,10 @@ BUILDER=loci
 LABEL=stx-placement
 PROJECT=placement
 PROJECT_REPO=https://opendev.org/openstack/placement.git
+PROJECT_UID=42425
+PROJECT_GID=42425
 PIP_PACKAGES="pycryptodomex httplib2"
+DIST_REPOS="OS"
 PROFILES="apache"
 CUSTOMIZATION="\
     ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \

openstack/python-placement/debian/stx-placement.stable_docker_image

@@ -3,7 +3,10 @@ LABEL=stx-placement
 PROJECT=placement
 PROJECT_REPO=https://opendev.org/openstack/placement.git
 PROJECT_REF=stable/ussuri
+PROJECT_UID=42425
+PROJECT_GID=42425
 PIP_PACKAGES="pycryptodomex httplib2"
+DIST_REPOS="OS"
 PROFILES="apache"
 CUSTOMIZATION="\
     ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \