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
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
new file mode 100644
index 0000000..2027844
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -0,0 +1,39 @@
+parameters:
+ _param:
+ stacklight_address: 172.16.10.251
+ stacklight_node01_hostname: mon01
+ stacklight_node02_hostname: mon02
+ stacklight_node03_hostname: mon03
+ stacklight_node01_address: 172.16.10.107
+ stacklight_node02_address: 172.16.10.108
+ stacklight_node03_address: 172.16.10.109
+ # GlusterFS
+ glusterfs_service_host: ${_param:stacklight_address}
+ # Prometheus
+ prometheus_control_address: ${_param:stacklight_address}
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:stacklight_address}
+ names:
+ - mon
+ - mon.${_param:cluster_domain}
+ mon01:
+ address: ${_param:stacklight_node01_address}
+ names:
+ - ${_param:stacklight_node01_hostname}
+ - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ mon02:
+ address: ${_param:stacklight_node02_address}
+ names:
+ - ${_param:stacklight_node02_hostname}
+ - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ mon03:
+ address: ${_param:stacklight_node03_address}
+ names:
+ - ${_param:stacklight_node03_hostname}
+ - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
new file mode 100644
index 0000000..14cd512
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
@@ -0,0 +1,8 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- cluster.virtual-mcp11-k8s-contrail.infra
+parameters:
+ _param:
+ cluster_public_host: ${_param:prometheus_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
new file mode 100644
index 0000000..6ef0e82
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -0,0 +1,42 @@
+classes:
+- system.linux.system.repo.tcp_elastic
+- system.docker.host
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- 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
+- system.prometheus.server.target.kubernetes
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.service.dashboard.grafana_server
+- cluster.virtual-mcp11-k8s-contrail.infra
+parameters:
+ _param:
+ cluster_public_host: ${_param:stacklight_hostname}
+ cluster_vip_address: mon
+ docker_image_alertmanager: alertmanager:latest
+ docker_image_pushgateway: pushgateway:latest
+ docker_image_prometheus: prometheus:latest
+ docker_image_grafana: grafana/grafana:latest
+ grafana_admin_password: admin
+ keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
+ keepalived_prometheus_vip_password: password
+ keepalived_prometheus_vip_interface: ens4
+ # Kibana
+ kibana_elasticsearch_host: ${_param:cluster_vip_address}
+ # Docker/Elasticsearch
+ cluster_node01_hostname: ${_param:stacklight_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_node03_address}