openstack/openstack-helm
Code Issues Proposed changes

Merge "To avoid wrong version check for mysqlclient"

Browse Source
This commit is contained in:
Zuul 2020-12-16 20:56:55 +00:00 committed by Gerrit Code Review
commit dda7276191
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/Chart.yaml
View File

@ -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.1.1 version: 0.1.2
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:

1
horizon/templates/bin/_django.wsgi.tpl
View File

@ -23,6 +23,7 @@ import sys
import pymysql import pymysql
pymysql.version_info = (1, 3, 13, "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

2
horizon/templates/bin/_horizon.sh.tpl
View File

@ -78,7 +78,7 @@ function start () {
/tmp/manage.py collectstatic --noinput /tmp/manage.py collectstatic --noinput
/tmp/manage.py compress --force /tmp/manage.py compress --force
rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
chmod +x ${SITE_PACKAGES_ROOT}/django/core/wsgi.py
exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }} exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
} }

2
horizon/templates/bin/_manage.py.tpl
View File

@ -23,7 +23,7 @@ import os
import sys import sys
import pymysql import pymysql
pymysql.version_info = (1, 3, 13, "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