| commit | 19bd2ab88175282c2818ea9b9e6644bd469cdabe | [log] [tgz] |
|---|---|---|
| author | dbrz <dobrogan5@gmail.com> | Thu Jul 26 14:48:32 2018 +0300 |
| committer | Tatyanka Leontovich <tleontovich@mirantis.com> | Mon Aug 20 11:48:19 2018 +0000 |
| tree | a22d40b4a198c1db07ead6ee0020a1e232da1a31 | |
| parent | 088857dc56e31bd06bc179fabd5d09ec9d924f96 [diff] |
Change default datasource from influx to prometheus Change-Id: I8e9ce24d0c92ed646c782841de09301a7fef35b5
diff --git a/tcp_tests/managers/sl_manager.py b/tcp_tests/managers/sl_manager.py index 0f81596..2c1ba2d 100644 --- a/tcp_tests/managers/sl_manager.py +++ b/tcp_tests/managers/sl_manager.py
@@ -52,6 +52,7 @@ for item in sl_vip_address_pillars for node, ip in item.items() if ip]) if not sl_vip_ip: + tgt = 'I@prometheus:server:enabled:True and mon*' pillar = 'keepalived:cluster:instance:VIP:address' sl_vip_address_pillars = self._salt.get_pillar(tgt=tgt, pillar=pillar)
diff --git a/tcp_tests/templates/cookied-bm-contrail40/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-contrail40/salt-context-cookiecutter-contrail.yaml index 85182a6..1125a8f 100644 --- a/tcp_tests/templates/cookied-bm-contrail40/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-contrail40/salt-context-cookiecutter-contrail.yaml
@@ -217,7 +217,7 @@ stacklight_log_node02_hostname: log02 stacklight_log_node03_address: 10.167.8.63 stacklight_log_node03_hostname: log03 - stacklight_long_term_storage_type: influxdb + stacklight_long_term_storage_type: prometheus stacklight_monitor_address: 10.167.8.70 stacklight_monitor_hostname: mon stacklight_monitor_node01_address: 10.167.8.71
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml index bcccb66..e57820e 100644 --- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
@@ -168,7 +168,7 @@ stacklight_log_node02_hostname: log02 stacklight_log_node03_address: 10.167.8.63 stacklight_log_node03_hostname: log03 - stacklight_long_term_storage_type: influxdb + stacklight_long_term_storage_type: prometheus stacklight_monitor_address: 10.167.8.70 stacklight_monitor_hostname: mon stacklight_monitor_node01_address: 10.167.8.71