commit 30a084ac40f80e286ef994b51eea9322a12cd6c1
author Simon Pasquier <spasquier@mirantis.com> Thu May 04 12:02:55 2017 +0200
committer Simon Pasquier <spasquier@mirantis.com> Thu May 04 12:02:55 2017 +0200
tree 382467681c0c72fa2f40b4b31da1b9314a842504
parent 9e34f47d87adfdf9bc38cf60daa933eccffc5f05

Move GlusterFS to Swarm nodes for mcp11-k8s-calico

Change-Id: I99fc8862b56c05ce76f1eb01182ee848799e87c8

classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml
index d054aa0..96c462b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml
@@ -1,3 +1,7 @@
 parameters:
   _param:
+    # glusterfs
+    glusterfs_service_host: ${_param:docker_swarm_address}
+
+    # prometheus
     prometheus_control_address: ${_param:docker_swarm_address}

classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml
index cf4b598..5a62ed5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml
@@ -8,6 +8,8 @@
 - service.haproxy.proxy.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
+- system.glusterfs.server.cluster
+- system.glusterfs.server.volume.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.prometheus.server.target.etcd