| commit | c44e30470aa096388b1cd5e09f51de239e98ee4e | [log] [tgz] |
|---|---|---|
| author | Tomas Kukral <tkukral@mirantis.com> | Thu May 04 12:49:32 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@5776b83a74fe> | Thu May 04 12:49:32 2017 +0000 |
| tree | c0a72c313dfa46489cce541578cd3f0b5c4d1c5e | |
| parent | 59a698dbd71bfe2847e175a6c41885ca2ec76631 [diff] | |
| parent | 30a084ac40f80e286ef994b51eea9322a12cd6c1 [diff] |
Merge "Move GlusterFS to Swarm nodes for mcp11-k8s-calico"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml index f224099..5f3298d 100644 --- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml +++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -4,8 +4,6 @@ - system.linux.system.repo.docker - system.salt.minion.cert.etcd_server - system.kubernetes.master.cluster -- system.glusterfs.server.cluster -- system.glusterfs.server.volume.prometheus - cluster.virtual-mcp11-k8s-calico.kubernetes.compute - cluster.virtual-mcp11-k8s-calico.infra parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml index d494439..d1d437d 100644 --- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml +++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -49,9 +49,6 @@ calico_private_network: 192.168.0.0 calico_private_netmask: 16 - # glusterfs - glusterfs_service_host: ${_param:kubernetes_control_address} - linux: network: resolv:
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}
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