Updated source to grab Prometheus and Alerta passwords
Since 2019.2.7 we have pillars on a proxy which store
passwords for some Stacklight UIs
Change-Id: I2ba344ced7f4b945e3b8ff33790252ff59d0cea3
Related-Prod: #PROD-34302(PROD:34302)
diff --git a/test_set/cvp-sanity/tests/test_stacklight.py b/test_set/cvp-sanity/tests/test_stacklight.py
index 78e190c..45bd9fb 100644
--- a/test_set/cvp-sanity/tests/test_stacklight.py
+++ b/test_set/cvp-sanity/tests/test_stacklight.py
@@ -145,16 +145,25 @@
IP = local_salt_client.pillar_get(param='_param:cluster_public_host')
prometheus_password_old = local_salt_client.pillar_get(
param='_param:keepalived_prometheus_vip_password_generated')
- prometheus_password = local_salt_client.pillar_get(
+ prometheus_password_generated = local_salt_client.pillar_get(
param='_param:prometheus_server_proxy_password_generated')
+ # New password in 2019.2.7
+ prometheus_password_from_nginx = local_salt_client.pillar_get(
+ tgt="nginx:server",
+ param='_param:nginx_proxy_prometheus_server_password')
proto = local_salt_client.pillar_get(
param='_param:cluster_public_protocol')
proxies = {"http": None, "https": None}
# keystone:server can return 3 nodes instead of 1
# this will be fixed later
# TODO
- if prometheus_password == '':
+ if prometheus_password_from_nginx:
+ prometheus_password = prometheus_password_from_nginx
+ elif prometheus_password_generated:
+ prometheus_password = prometheus_password_generated
+ else:
prometheus_password = prometheus_password_old
+
response = requests.get(
'{0}://{1}:15010/api/v1/alerts'.format(proto, IP),
proxies=proxies,