Sync sl-k8s-calico model with virtual-mcp11-k8s-calico
Change-Id: Ie3ac2560746f33a6d02a44baeaa8175dadff25b7
diff --git a/classes/cluster/sl-k8s-calico/stacklight/client.yml b/classes/cluster/sl-k8s-calico/stacklight/client.yml
index a78a537..33b2cf0 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/client.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/client.yml
@@ -4,9 +4,6 @@
- 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 2d4dc23..3910a1a 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -1,22 +1,21 @@
classes:
- service.grafana.collector
- system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
- system.prometheus.collector
- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.252
- 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
+ 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
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -26,10 +25,15 @@
galera_server_cluster_name: monitoring_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
+ galera_innodb_read_io_threads: 2
+ galera_innodb_write_io_threads: 2
+ galera_wsrep_slave_threads: 2
+ galera_xtrabackup_parallel: 1
+ galera_error_log_enabled: true
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
@@ -39,20 +43,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_monitor_node01_address}
+ address: ${_param:stacklight_node01_address}
names:
- - ${_param:stacklight_monitor_node01_hostname}
- - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_node01_hostname}
+ - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_monitor_node02_address}
+ address: ${_param:stacklight_node02_address}
names:
- - ${_param:stacklight_monitor_node02_hostname}
- - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_node02_hostname}
+ - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_monitor_node03_address}
+ address: ${_param:stacklight_node03_address}
names:
- - ${_param:stacklight_monitor_node03_hostname}
- - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+ - ${_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/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 979b08d..61f2b6b 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -1,21 +1,21 @@
classes:
- system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.docker
# Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
@@ -30,8 +30,8 @@
parameters:
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_local_address: ${_param:single_address}
cluster_public_host: mon
+ cluster_local_address: ${_param:single_address}
docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
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
@@ -45,25 +45,28 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# Docker/Elasticsearch
- 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}
- # Galera
- galera_innodb_buffer_pool_size: 1024M
- galera_max_connections: 200
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_grafana_port: 3000
+ 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}
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
openstack_version: newton
+ galera_innodb_buffer_pool_size: 1024M
+ galera_max_connections: 200
# Grafana
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
grafana_database_password: ${_param:mysql_grafana_password}
- influxdb_port: 8086
+ # InfluxDB
influxdb_admin_password: password
+ influxdb_port: 15016
influxdb_stacklight_password: lmapass
influxdb_client_host: ${_param:stacklight_monitor_address}
influxdb_client_port: ${_param:influxdb_port}
@@ -72,8 +75,7 @@
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- rabbitmq_openstack_password: workshop
- heka_amqp_host: ${_param:kubernetes_control_address}
+ telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
elasticsearch:
server:
heap: