Update sl-os-contrail model to ocata
Change-Id: Iee4c367102ced269ef20752a6398494a35f03058
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index f67f8dd..8eaf978 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -2,9 +2,13 @@
- system.docker.host
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
- system.linux.system.repo.docker
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -15,17 +19,19 @@
- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
+- system.influxdb.database.ceilometer
- 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.dns
- system.docker.swarm.stack.monitoring.prometheus_global
-- system.docker.swarm.stack.dashboard
- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
- cluster.sl-os-contrail
parameters:
_param:
+ heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
@@ -34,38 +40,28 @@
cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
- cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_hostname: mon01
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_hostname: mon02
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_hostname: mon03
cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:openstack_database_address}
- grafana_database_password: ${_param:mysql_grafana_password}
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
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_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
docker_image_grafana: grafana/grafana:4.5.2
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:cluster_vip_address}
- grafana_database_password: ${_param:mysql_grafana_password}
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- influxdb_port: 8086
- influxdb_admin_password: password
- influxdb_stacklight_password: lmapass
- openstack_version: newton
remote_collector_telegraf_host: monitoring_remote_agent
- heka_amqp_host: ${_param:openstack_control_address}
linux:
network:
interface:
@@ -75,7 +71,3 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- elasticsearch:
- server:
- heap:
- size: 1