Merge "Use master reclass in tests to debug undefined vars"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 257b567..8befee7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -78,7 +78,7 @@
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
- horizon_identity_version: 3
+ horizon_identity_version: 2
mongodb_server_replica_set: ceilometer
mongodb_ceilometer_password: cloudlab
mongodb_admin_password: cloudlab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index d09a5be..bcd69b2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -79,7 +79,7 @@
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
- horizon_identity_version: 3
+ horizon_identity_version: 2
mongodb_server_replica_set: ceilometer
mongodb_ceilometer_password: cloudlab
mongodb_admin_password: cloudlab
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 4f7a0bd..dfd50bb 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -15,6 +15,7 @@
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.service.dashboard.grafana_server
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 3405614..cd9fc9f 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -15,6 +15,7 @@
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring
- system.docker.swarm.service.dashboard.grafana_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 8e56ad6..6919acf 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -17,6 +17,7 @@
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
- system.prometheus.server.target.dns
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 5635528..4e48477 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -17,6 +17,7 @@
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
- system.prometheus.server.target.dns
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 6ef0e82..a9d8520 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -13,6 +13,7 @@
- system.glusterfs.server.volume.prometheus
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.etcd
- system.prometheus.server.target.kubernetes
- system.prometheus.server.target.dns
@@ -21,8 +22,8 @@
- cluster.virtual-mcp11-k8s-contrail.infra
parameters:
_param:
- cluster_public_host: ${_param:stacklight_hostname}
- cluster_vip_address: mon
+ cluster_public_host: mon
+ cluster_vip_address: ${_param:stacklight_address}
docker_image_alertmanager: alertmanager:latest
docker_image_pushgateway: pushgateway:latest
docker_image_prometheus: prometheus:latest
diff --git a/classes/system b/classes/system
index 7f63214..7e9b8b2 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 7f63214c596dfc8ce1636f7e5521f68b122c4116
+Subproject commit 7e9b8b2c04e17bcfd4cbbfb60b7b10a57a6b03dc