From 2bef4e500a70e9244d3452f213866cb858db90a2 Mon Sep 17 00:00:00 2001 From: zhangjianweibj Date: Mon, 11 Mar 2019 15:36:55 +0800 Subject: [PATCH] cassandra contact_points bug persister get contact_points from configuration file with "[ip.dest for ip in conf.cassandra.contact_points]". cfg.dest replace "-" with "_".if user config cassandra hosts cassandra-0,then persister crashed. Task: 29957 Story: 2005195 Change-Id: I9ee29fdce781739f06683e4b4a80183669663189 --- monasca_persister/conf/cassandra.py | 3 ++- monasca_persister/repositories/cassandra/connection_util.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monasca_persister/conf/cassandra.py b/monasca_persister/conf/cassandra.py index 09bbe18a..6b011550 100644 --- a/monasca_persister/conf/cassandra.py +++ b/monasca_persister/conf/cassandra.py @@ -16,12 +16,13 @@ # limitations under the License. from oslo_config import cfg +from oslo_config import types cassandra_opts = [ cfg.ListOpt('contact_points', help='Comma separated list of Cassandra node IP addresses', default=['127.0.0.1'], - item_type=cfg.IPOpt), + item_type=types.HostAddress()), cfg.IntOpt('port', help='Cassandra port number', default=8086), diff --git a/monasca_persister/repositories/cassandra/connection_util.py b/monasca_persister/repositories/cassandra/connection_util.py index 73d15a31..86bfed7d 100644 --- a/monasca_persister/repositories/cassandra/connection_util.py +++ b/monasca_persister/repositories/cassandra/connection_util.py @@ -31,8 +31,7 @@ def create_cluster(): else: auth_provider = None - contact_points = [ip.dest for ip in conf.cassandra.contact_points] - cluster = Cluster(contact_points, + cluster = Cluster(conf.cassandra.contact_points, port=conf.cassandra.port, auth_provider=auth_provider, connect_timeout=conf.cassandra.connection_timeout,