openstack
/
monasca-api
Code Issues Proposed changes

Fix mysql connection error in docker env 

Fix mysql connection bug.Support mysql connection port option.

Change-Id: Ifca5768d271a9a074e23aa60721cd9cbca107688
This commit is contained in:
zhangjianweibj 2019-04-19 09:28:09 +08:00 committed by Dobroslaw Zybort
parent a9cc4bb482
commit f39b1d9b53
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/Dockerfile
View File

@ -31,6 +31,7 @@ ENV \
CASSANDRA_USER=mon_persister \
CASSANDRA_PASSWORD=password \
MYSQL_HOST=mysql \
MYSQL_PORT=3306 \
MYSQL_USER=monapi \
MYSQL_PASSWORD=password \
MYSQL_DB=mon \

2
docker/monasca-api.conf.j2
View File

@ -216,7 +216,7 @@ password = {{ CASSANDRA_PASSWORD }}
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
{% if not ( API_MYSQL_DISABLED is defined and API_MYSQL_DISABLED | lower == 'true' ) %}
connection = "mysql+pymysql://{{ MYSQL_USER }}:{{ MYSQL_PASSWORD }}@{{ MYSQL_HOST }}/{{ MYSQL_DB }}"
connection = "mysql+pymysql://{{ MYSQL_USER }}:{{ MYSQL_PASSWORD }}@{{ MYSQL_HOST }}:{{ MYSQL_PORT | default('3306') }}/{{ MYSQL_DB }}"
{% endif %}