diff --git a/docker/Dockerfile b/docker/Dockerfile index cdd822f6f..8c1e16210 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 \ diff --git a/docker/monasca-api.conf.j2 b/docker/monasca-api.conf.j2 index 0d1be8a62..e477efc60 100644 --- a/docker/monasca-api.conf.j2 +++ b/docker/monasca-api.conf.j2 @@ -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 %}