openstack
/
monasca-api
Code Issues Proposed changes

Support cassandra connection timeout option 

Support cassandra connection timeout option in Dockerfile.

Change-Id: Ib9045b9cb81472beb044960fcb3d4e109a4d187c
This commit is contained in:
zhangjianweibj 2019-06-10 10:42:38 +08:00 committed by Dobroslaw Zybort
parent ec6daef9dd
commit 3064898685
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/Dockerfile
View File

@ -30,6 +30,7 @@ ENV \
CASSANDRA_KEY_SPACE=monasca \
CASSANDRA_USER=mon_persister \
CASSANDRA_PASSWORD=password \
CASSANDRA_CONNECTION_TIMEOUT=5 \
MYSQL_HOST=mysql \
MYSQL_PORT=3306 \
MYSQL_USER=monapi \

1
docker/README.rst
View File

@ -37,6 +37,7 @@ CASSANDRA_PORT 9042
CASSANDRA_KEY_SPACE monasca Cassandra keyspace where metric are stored
CASSANDRA_USER mon_persister Cassandra user name
CASSANDRA_PASSWORD password Cassandra password
CASSANDRA_CONNECTION_TIMEOUT 5 Cassandra timeout in seconds when creating a new connection
MYSQL_HOST mysql The host for MySQL
MYSQL_PORT 3306 The port for MySQL
MYSQL_USER monapi The MySQL username

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

@ -195,6 +195,10 @@ user = {{ CASSANDRA_USER }}
# (string value)
password = {{ CASSANDRA_PASSWORD }}
#
# Cassandra connection timeout in seconds
# (integer value)
connection_timeout = {{ CASSANDRA_CONNECTION_TIMEOUT }}
[database]