Align Horizon image and overrides with 2024.1

This update modifies the Horizon image file to track the latest commit
of stable/2024.1, enabling the build of the stx-horizon Docker image.
It also updates the static overrides for MariaDB to upgrade it, as
Django 4.2 of Horizon requirements for 2024.1 mandate MariaDB 10.4 or
higher.

Additionally, this change includes pymemcache in the image and aligns
various components, including Horizon static overrides, to ensure
compatibility with pymemcache and the new version of Django. These
updates align with the stable/2024.1 branch of Horizon.

Test Plan:
- PASS: Successfully build the stx-horizon Docker image
- PASS: Apply the new tarball containing static override changes
- PASS: Override stx-horizon image tags
- PASS: Apply stx-openstack with Horizon and MariaDB image overrides

Story: 2011303
Task: 51502

Depends-on: https://review.opendev.org/c/starlingx/root/+/940525

Change-Id: I7be859eda41c0a22cb3b1cb6f0fe3180c7e2f492
Signed-off-by: Mateus Nascimento <mateus.soaresdonascimento@windriver.com>
This commit is contained in:
Mateus Nascimento 2025-01-31 11:30:42 -03:00 committed by Murillo Arantes
parent e41041b327
commit e53fa7aadf
3 changed files with 16 additions and 6 deletions

View File

@ -126,7 +126,7 @@ conf:
template: |
import os
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from openstack_dashboard import exceptions
@ -249,7 +249,7 @@ conf:
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
'LOCATION': '{{ tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}',
}
}
@ -262,6 +262,15 @@ conf:
'PASSWORD': '{{ .Values.endpoints.oslo_db.auth.horizon.password }}',
'HOST': '{{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}',
'default-character-set': 'utf8',
{{- if .Values.manifests.certificates }}
'OPTIONS':{
'ssl': {
'ca': '/etc/mysql/certs/ca.crt',
'cert': '/etc/mysql/certs/tls.crt',
'key': '/etc/mysql/certs/tls.key'
}
},
{{- end }}
'PORT': '{{ tuple "oslo_db" "internal" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}'
}
}

View File

@ -29,8 +29,8 @@ images:
prometheus_mysql_exporter: null
prometheus_mysql_exporter_helm_tests: null
ks_user: docker.io/starlingx/stx-heat:master-debian-stable-latest
mariadb: docker.io/openstackhelm/mariadb:ubuntu_xenial-20200303
mariadb_backup: docker.io/openstackhelm/mariadb:10.2.18
mariadb: docker.io/openstackhelm/mariadb:ubuntu_focal-20250111
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:2ddd25489a782675bbeaf723bb1442d757fe0cb3-ubuntu_focal
pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
scripted_test: null
pod:

View File

@ -2,7 +2,7 @@ BUILDER=loci
LABEL=stx-horizon
PROJECT=horizon
PROJECT_REPO=https://opendev.org/openstack/horizon.git
PROJECT_REF=068e207393455441e7bad0eb5958be6a3c35f505
PROJECT_REF=a8b3b4621f342742bac3a11708df869a6a9a5b15
UPGRADE_PIP_PACKAGES=pip
DIST_REPOS="OS"
PROJECT_UID=42425
@ -12,7 +12,8 @@ PIP_PACKAGES="\
ldap \
pycryptodomex \
python-ceilometerclient \
pyudev
pyudev \
pymemcache
"
PROFILES="fluent horizon apache"
CUSTOMIZATION="\