Align horizon chart with 2024.1

- Update pymysql version info. Horizon requiers newer
  mysql client version than we had previously
- Update scripts to use sysconfig.get_path
  instead of distutils.sysconfig.get_python_lib which
  is deprecated

Story: 2011130
Depends-On: Ibd278f64b49c445dbbf774240a38c6c5ef3a4548
Change-Id: Ic763b72268042bda029c373d2b54c4c309fc70d2
This commit is contained in:
Vladimir Kozhukalov 2024-05-15 16:44:42 -05:00
parent a1aa351d4f
commit c93df10773
8 changed files with 9 additions and 7 deletions

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Horizon
name: horizon
version: 0.3.21
version: 0.3.22
home: https://docs.openstack.org/horizon/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
sources:

View File

@ -16,7 +16,7 @@ limitations under the License.
set -ex
SITE_PACKAGES_ROOT=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
SITE_PACKAGES_ROOT=$(python -c "from sysconfig import get_path; print(get_path('platlib'))")
rm -f ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
ln -s /etc/openstack-dashboard/local_settings ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py

View File

@ -23,7 +23,7 @@ import sys
import pymysql
pymysql.version_info = (1, 4, 0, "final", 0)
pymysql.version_info = (2, 2, 4, 'final', 0)
pymysql.install_as_MySQLdb()
from django.core.wsgi import get_wsgi_application

View File

@ -18,7 +18,7 @@ set -ex
COMMAND="${@:-start}"
function start () {
SITE_PACKAGES_ROOT=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
SITE_PACKAGES_ROOT=$(python -c "from sysconfig import get_path; print(get_path('platlib'))")
rm -f ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
ln -s /etc/openstack-dashboard/local_settings ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
ln -s ${SITE_PACKAGES_ROOT}/openstack_dashboard/conf/default_policies /etc/openstack-dashboard/default_policies

View File

@ -23,7 +23,7 @@ import os
import sys
import pymysql
pymysql.version_info = (1, 4, 0, "final", 0)
pymysql.version_info = (2, 2, 4, 'final', 0)
pymysql.install_as_MySQLdb()
from django.core.management import execute_from_command_line

View File

@ -262,7 +262,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
@ -394,7 +394,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" }}',
}
}

View File

@ -58,4 +58,5 @@ horizon:
- 0.3.19 Add 2024.1 overrides
- 0.3.20 Enable custom annotations for Openstack secrets
- 0.3.21 Update images used by default
- 0.3.22 Align with 2024.1 requirements
...

View File

@ -45,6 +45,7 @@
- openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes
- openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 nodes
- openstack-helm-compute-kit-helm-repo-local-2024-1-ubuntu_jammy # 1 node + 2 nodes
- openstack-helm-horizon-2024-1-ubuntu_jammy # 1 node
gate:
jobs:
- openstack-helm-lint