commit 60f94c7f7d0c216324cf9b7d9a62e6f439d31818
author Martin Polreich <polreichmartin@gmail.com> Mon Jul 17 09:29:10 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Tue Jul 18 07:47:19 2017 +0000
tree 2f1a822893c7b349acf125b3554ced20f96de16f
parent 36416d1cee07103df26b5f0f49cfd686950c21b1

Update Stacklight k8s-calico models

Change-Id: Id8d824e4c5e3d5f8f89805fb98af3ae9f796d907

classes/cluster/sl_k8s_calico/stacklight/server.yml

diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index ce40987..14821d1 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -9,6 +9,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
@@ -20,15 +21,18 @@
 - system.influxdb.database.stacklight
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
 - 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
+- system.docker.swarm.stack.dashboard
 - cluster.sl_k8s_calico
 parameters:
   _param:
-    cluster_vip_address: ${_param:stacklight_address}
+    cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_public_host: mon
     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
@@ -39,31 +43,33 @@
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
-    keepalived_prometheus_vip_interface: ${_param:primary_interface}
+    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}
+    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: ocata
+    openstack_version: newton
     # Grafana
-    docker_grafana_replicas: 1
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    grafana_database_type: mysql
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
-    prometheus_influxdb_url: "http://${_param:stacklight_address}:8086/"
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
     prometheus_influxdb_db: lma
     prometheus_influxdb_username: lma
-    prometheus_influxdb_password: lmapass
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+  elasticsearch:
+    server:
+      heap:
+        size: 1
   keepalived:
     cluster:
       instance: