Pin the ES/Kibana to 5.x as a current one
- Prevent getting all apt_mcp ES/Kibana repos. Instead, add only 5x.
- Set ES/Kibana version to the major '5'.
Change-Id: I80046b738a70435044076ee95c40f4de40b8da20
Related-Bug: PROD-18541
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index a8c2e44..dc3ffea 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
- system.linux.system.repo.docker
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
@@ -45,6 +45,7 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
+ elasticsearch_version: 5
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
@@ -59,6 +60,7 @@
grafana_database_password: ${_param:mysql_grafana_password}
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
+ kibana_version: 5
# Docker/Elasticsearch
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601