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:
parent
a1aa351d4f
commit
c93df10773
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Horizon
|
description: OpenStack-Helm Horizon
|
||||||
name: horizon
|
name: horizon
|
||||||
version: 0.3.21
|
version: 0.3.22
|
||||||
home: https://docs.openstack.org/horizon/latest/
|
home: https://docs.openstack.org/horizon/latest/
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
set -ex
|
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
|
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 /etc/openstack-dashboard/local_settings ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ import sys
|
|||||||
|
|
||||||
import pymysql
|
import pymysql
|
||||||
|
|
||||||
pymysql.version_info = (1, 4, 0, "final", 0)
|
pymysql.version_info = (2, 2, 4, 'final', 0)
|
||||||
pymysql.install_as_MySQLdb()
|
pymysql.install_as_MySQLdb()
|
||||||
|
|
||||||
from django.core.wsgi import get_wsgi_application
|
from django.core.wsgi import get_wsgi_application
|
||||||
|
@ -18,7 +18,7 @@ set -ex
|
|||||||
COMMAND="${@:-start}"
|
COMMAND="${@:-start}"
|
||||||
|
|
||||||
function 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
|
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 /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
|
ln -s ${SITE_PACKAGES_ROOT}/openstack_dashboard/conf/default_policies /etc/openstack-dashboard/default_policies
|
||||||
|
@ -23,7 +23,7 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
import pymysql
|
import pymysql
|
||||||
pymysql.version_info = (1, 4, 0, "final", 0)
|
pymysql.version_info = (2, 2, 4, 'final', 0)
|
||||||
pymysql.install_as_MySQLdb()
|
pymysql.install_as_MySQLdb()
|
||||||
|
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
|
@ -262,7 +262,7 @@ conf:
|
|||||||
template: |
|
template: |
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from openstack_dashboard import exceptions
|
from openstack_dashboard import exceptions
|
||||||
|
|
||||||
@ -394,7 +394,7 @@ conf:
|
|||||||
|
|
||||||
CACHES = {
|
CACHES = {
|
||||||
'default': {
|
'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" }}',
|
'LOCATION': '{{ tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -58,4 +58,5 @@ horizon:
|
|||||||
- 0.3.19 Add 2024.1 overrides
|
- 0.3.19 Add 2024.1 overrides
|
||||||
- 0.3.20 Enable custom annotations for Openstack secrets
|
- 0.3.20 Enable custom annotations for Openstack secrets
|
||||||
- 0.3.21 Update images used by default
|
- 0.3.21 Update images used by default
|
||||||
|
- 0.3.22 Align with 2024.1 requirements
|
||||||
...
|
...
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
- openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes
|
- 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-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-compute-kit-helm-repo-local-2024-1-ubuntu_jammy # 1 node + 2 nodes
|
||||||
|
- openstack-helm-horizon-2024-1-ubuntu_jammy # 1 node
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-helm-lint
|
- openstack-helm-lint
|
||||||
|
Loading…
Reference in New Issue
Block a user