Merge swarm and monitoring classes (mcp11-k8s-*)
This avoids many problems when overriding parameters in the init
classes.
Change-Id: I71067f26c95e0e3807cd1eb94a6bb735f08df166
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml
new file mode 100644
index 0000000..3799964
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/client.yml
@@ -0,0 +1,17 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+parameters:
+ _param:
+ # Elasticsearch/Kibana client parameters
+ stacklight_log_address: ${_param:stacklight_address}
+ # Grafana client parameters
+ grafana_address: ${_param:stacklight_address}
+ grafana_port: 15013
+ grafana_user: admin
+ grafana_password: ${_param:grafana_admin_password}
+ grafana_prometheus_address: ${_param:stacklight_address}
+ grafana_prometheus_port: 15010