Deploy Prometheus services in mcp11-k8S-calico
This change also installs Telegraf and bumps classes/system because it
is needed for Prometheus.
Change-Id: I16e08a41a1b3a13a2132572b35a8abe5e85ed693
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/control.yml
deleted file mode 100644
index 5f91f9e..0000000
--- a/classes/cluster/virtual-mcp11-k8s-calico/swarm/control.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-classes:
-- system.docker.host
-- cluster.virtual-mcp11-k8s-calico.infra
-parameters:
- _param:
- cluster_vip_address: ${_param:docker_swarm_address}
- cluster_public_host: ${_param:docker_swarm_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml
index 8d53081..b2d33a1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml
@@ -1,8 +1,11 @@
classes:
- system.docker.client
+- system.docker.host
- system.docker.swarm.master
-- cluster.virtual-mcp11-k8s-calico.swarm.control
+- cluster.virtual-mcp11-k8s-calico.infra
parameters:
+ _param:
+ cluster_public_host: ${_param:docker_swarm_hostname}
docker:
client:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml
index 1b1a8d2..810da3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml
@@ -1,7 +1,10 @@
classes:
+- system.docker.host
- system.docker.swarm.manager
-- cluster.virtual-mcp11-k8s-calico.swarm.control
+- cluster.virtual-mcp11-k8s-calico.infra
parameters:
+ _param:
+ cluster_public_host: ${_param:docker_swarm_hostname}
docker:
swarm:
master: