Revert "Update sl_k8s_calico models"
This reverts commit e048a839e5d62dab349a5cf20fc9c2886add175f.
Change-Id: Ic03d0e11deabca745a2601ef191acb56e77841b7
diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index 393449c..f27aece 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -1,9 +1,11 @@
classes:
-- system.docker.client
- system.elasticsearch.client.single
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- cluster.sl_k8s_calico
parameters:
_param:
# Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index 243a614..6df9960 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,12 +1,16 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.252
- 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
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
# Glusterfs
glusterfs_service_host: ${_param:stacklight_monitor_address}
@@ -35,20 +39,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_node01_address}
+ address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_node03_address}
+ address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
index 393449c..f2a4469 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
@@ -1,17 +1,18 @@
classes:
-- system.docker.client
-- system.elasticsearch.client.single
-- system.grafana.client
-- system.grafana.client.datasource.prometheus
-- system.kibana.client.single
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.sl_k8s_calico
parameters:
_param:
- # Elasticsearch/Kibana client parameters
- stacklight_log_address: ${_param:stacklight_monitor_address}
- # Grafana client parameters
- grafana_address: ${_param:stacklight_monitor_address}
- grafana_port: 15013
- grafana_user: admin
- grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_monitor_address}
- grafana_prometheus_port: 15010
+ cluster_public_host: ${_param:prometheus_control_address}
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index e83b0d6..7eafd54 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -1,6 +1,8 @@
classes:
- system.docker.host
+- system.linux.system.repo.influxdb
- system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.glusterfs
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.elasticsearch.server.cluster
@@ -8,6 +10,7 @@
- system.kibana.server.single
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
@@ -17,8 +20,8 @@
- system.glusterfs.server.volume.influxdb
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.influxdb.client
-- system.influxdb.client.database.prometheus
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
- system.telegraf.agent.remote
@@ -26,10 +29,11 @@
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.kubernetes
- system.prometheus.server.target.dns
-- system.docker.swarm.stack.influxdb
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
-- cluster.sl_k8s_calico.infra
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.heka.ceilometer_collector.single
+- cluster.sl_k8s_calico
parameters:
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
@@ -38,6 +42,7 @@
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
docker_influxdb_image: influxdb:1.2
@@ -46,12 +51,12 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# 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}
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
@@ -60,9 +65,8 @@
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
grafana_database_password: ${_param:mysql_grafana_password}
- # InfluxDB
+ influxdb_port: 8086
influxdb_admin_password: password
- influxdb_port: 15016
influxdb_stacklight_password: lmapass
influxdb_client_host: ${_param:stacklight_monitor_address}
influxdb_client_port: ${_param:influxdb_port}
@@ -71,7 +75,9 @@
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
+ remote_collector_telegraf_host: monitoring_remote_agent
+ rabbitmq_openstack_password: workshop
+ heka_amqp_host: ${_param:kubernetes_control_address}
elasticsearch:
server:
heap: