Merge "Add new Opencontrail repository class"
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ed8599e..b402031 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -6,8 +6,8 @@
docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:mcp_version}"
# openldap:1.1.8
docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:mcp_version}"
- # library/postgres:9.6 #G
- docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:mcp_version}"
+ # library/postgres:9.6
+ docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
# library/mongo:3.4 #G
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
###
diff --git a/defaults/init.yml b/defaults/init.yml
index e79c7e5..9b2b6cf 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -15,6 +15,7 @@
- system.defaults.gerrit
- system.defaults.keepalived
- system.defaults.salt
+- system.defaults.stacklight
parameters:
_param:
mcp_version: stable
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 00c91bd..b38a11c 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -14,7 +14,7 @@
linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
- linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-5.x/
+ linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-${_param:elasticsearch_version}.x/
linux_system_repo_mcp_extra_url: ${_param:linux_system_repo_url}/extra/
linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb
diff --git a/defaults/stacklight.yml b/defaults/stacklight.yml
new file mode 100644
index 0000000..1abbb5e
--- /dev/null
+++ b/defaults/stacklight.yml
@@ -0,0 +1,5 @@
+parameters:
+ _param:
+ # ELK stack versions
+ elasticsearch_version: 5
+ kibana_version: 5
diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 1bbe404..76774aa 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -6,7 +6,6 @@
java_environment_version: "8"
java_environment_platform: openjdk
elasticsearch_cluster_name: elasticsearch
- elasticsearch_version: 5
linux:
system:
sysctl:
diff --git a/elasticsearch/server/single.yml b/elasticsearch/server/single.yml
index 419513d..a044394 100644
--- a/elasticsearch/server/single.yml
+++ b/elasticsearch/server/single.yml
@@ -2,8 +2,6 @@
- service.java.environment.openjdk8
- service.elasticsearch.server.single
parameters:
- _param:
- elasticsearch_version: 5
linux:
system:
sysctl:
diff --git a/kibana/server/single.yml b/kibana/server/single.yml
index 745c07a..965f274 100644
--- a/kibana/server/single.yml
+++ b/kibana/server/single.yml
@@ -1,8 +1,6 @@
classes:
- service.kibana.server.single
parameters:
- _param:
- kibana_version: 5
kibana:
server:
enabled: true