summaryrefslogtreecommitdiffstats
path: root/dashboard/dashboard/conf/config.py
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-10-08 16:45:49 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-10-10 10:40:00 +0800
commit60cd25286de20e218533c6da6e3dbe29f8644798 (patch)
tree40aa95987fbd68bf810f75e47f7ba352763efe99 /dashboard/dashboard/conf/config.py
parentbfdcb5a3562ef74eb64e574eff8ae4dbeb5787a0 (diff)
separate visualization building from dashboard building
JIRA: RELENG-155 Change-Id: I19355898d5dc5ef73fcfe4ebaf4604c4bf1e8f10 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'dashboard/dashboard/conf/config.py')
-rw-r--r--dashboard/dashboard/conf/config.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/dashboard/dashboard/conf/config.py b/dashboard/dashboard/conf/config.py
index b868999..143b193 100644
--- a/dashboard/dashboard/conf/config.py
+++ b/dashboard/dashboard/conf/config.py
@@ -23,8 +23,8 @@ class APIConfig:
def __init__(self):
self._default_config_location = "../etc/config.ini"
- self.elastic_url = 'http://localhost:9200'
- self.elastic_creds = None
+ self.es_url = 'http://localhost:9200'
+ self.es_creds = None
self.kibana_url = None
self.is_js = True
self.js_path = None
@@ -64,8 +64,8 @@ class APIConfig:
raise ParseError("%s not found" % config_location)
# Linking attributes to keys from file with their sections
- obj.elastic_url = obj._get_str_parameter("elastic", "url")
- obj.elastic_creds = obj._get_str_parameter("elastic", "creds")
+ obj.es_url = obj._get_str_parameter("elastic", "url")
+ obj.es_creds = obj._get_str_parameter("elastic", "creds")
obj.kibana_url = obj._get_str_parameter("kibana", "url")
obj.is_js = obj._get_bool_parameter("kibana", "js")
obj.js_path = obj._get_str_parameter("kibana", "js_path")
@@ -77,8 +77,8 @@ class APIConfig:
"elastic_creds = %s \n" \
"kibana_url = %s \n" \
"is_js = %s \n" \
- "js_path = %s \n" % (self.elastic_url,
- self.elastic_creds,
+ "js_path = %s \n" % (self.es_url,
+ self.es_creds,
self.kibana_url,
self.is_js,
self.js_path)