commit a7a449d858cfd709d45f3f745539ca8c5c42d961
author Simon Pasquier <spasquier@mirantis.com> Thu May 11 10:03:41 2017 +0200
committer Simon Pasquier <spasquier@mirantis.com> Fri May 12 17:02:55 2017 +0200
tree 188caa9ad91bcfee589f3ba328c0bdd045982f2c
parent 3404b566922b175812c91c08e0e6f2a470bef7b9

Merge swarm and monitoring classes (mcp11-k8s-*)

This avoids many problems when overriding parameters in the init
classes.

Change-Id: I71067f26c95e0e3807cd1eb94a6bb735f08df166

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

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index d1e0603..f646f66 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -11,9 +11,9 @@
 - system.rsyslog.client.single
 - system.telegraf.agent
 - system.prometheus.collector
+- service.grafana.collector
 - cluster.virtual-mcp11-k8s-calico.kubernetes
-- cluster.virtual-mcp11-k8s-calico.monitoring
-- cluster.virtual-mcp11-k8s-calico.swarm
+- cluster.virtual-mcp11-k8s-calico.stacklight
 - cluster.overwrite
 parameters:
   _param: