openstack
/
monasca-api
Code Issues Proposed changes

Merge "Support cassandra connection timeout option"

This commit is contained in:
Zuul 2019-08-28 03:16:38 +00:00 committed by Gerrit Code Review
parent dfd9423526 3064898685
commit 3068f55d05
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]