From 8369c5c2598075149e4ee1a2f580b72d503ae128 Mon Sep 17 00:00:00 2001 From: zhangjianweibj Date: Fri, 12 Apr 2019 15:11:47 +0800 Subject: [PATCH] Docker support cassandra keyspace option Support user configure cassandra keyspace. Story: 2005472 Task: 30553 Change-Id: Ifd1e6787825f79c8854ea3f771a45324e89b8e6f --- docker/Dockerfile | 1 + docker/README.rst | 1 + docker/monasca-api.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4eeb6253d..cdd822f6f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,6 +27,7 @@ ENV \ INFLUX_DB=mon \ CASSANDRA_CONTACT_POINTS=cassandra \ CASSANDRA_PORT=9042 \ + CASSANDRA_KEY_SPACE=monasca \ CASSANDRA_USER=mon_persister \ CASSANDRA_PASSWORD=password \ MYSQL_HOST=mysql \ diff --git a/docker/README.rst b/docker/README.rst index 3d513ea04..501a7d554 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -53,6 +53,7 @@ INFLUX_PASSWORD password INFLUX_DB mon The influx database name CASSANDRA_CONTACT_POINTS cassandra Cassandra node addresses CASSANDRA_PORT 9042 Cassandra port number +CASSANDRA_KEY_SPACE monasca Cassandra keyspace where metric are stored CASSANDRA_USER mon_persister Cassandra user name CASSANDRA_PASSWORD password Cassandra password MYSQL_DB_HOST mysql The host for MySQL diff --git a/docker/monasca-api.conf.j2 b/docker/monasca-api.conf.j2 index dffe7b873..0d1be8a62 100644 --- a/docker/monasca-api.conf.j2 +++ b/docker/monasca-api.conf.j2 @@ -183,7 +183,7 @@ port = {{ CASSANDRA_PORT | default('9042') }} # # keyspace where metric are stored # (string value) -keyspace = monasca +keyspace = {{ CASSANDRA_KEY_SPACE }} # # Cassandra user for monasca-api service