commit 52cd5c2aa35129acc5db4693500268b66f68e996
author azvyagintsev <azvyagintsev@mirantis.com> Wed Sep 19 15:01:22 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Mon Oct 22 15:36:04 2018 +0300
tree 5a12c80711837939a4a3b2b8e40c882db362cf39
parent 1efb0dcb0e420f33ece3107fda854165d964788b

Move few docker_images* under 'defaults' logic

   * Move all docker-images-artifacts under one class
   * This patch affect only:
     - docker-images CI\CD

Change-Id: I534c3a1d642bfb522e4ae8f195906de8f9ee718e

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
new file mode 100644
index 0000000..8d13c63
--- /dev/null
+++ b/defaults/docker_images.yml
@@ -0,0 +1,19 @@
+parameters:
+  _param:
+    # CI\CD
+    docker_image_compose:    "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:apt_mk_version}"
+    docker_image_registry:   "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:apt_mk_version}"
+    docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:apt_mk_version}"
+    # openldap:1.1.8
+    docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:apt_mk_version}"
+    # library/postgres:9.6  #G
+    docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:apt_mk_version}"
+    # library/mongo:3.4 #G
+    docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:apt_mk_version}"
+    ###
+    # phpldapadmin:0.6.12
+    docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:apt_mk_version}"
+    # gerrit:2.13.6
+    docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:apt_mk_version}"
+    # mysql:5.6
+    docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:apt_mk_version}"

defaults/init.yml

diff --git a/defaults/init.yml b/defaults/init.yml
index 9674799..c27f77c 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -11,10 +11,11 @@
 - system.defaults.galera
 - system.defaults.rabbitmq
 - system.defaults.debmirror
+- system.defaults.docker_images
 parameters:
   _param:
-    apt_mk_version: "stable"
-    linux_system_architecture: 'amd64'
+    apt_mk_version: stable
+    linux_system_architecture: amd64
     linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
     # Openstack globals
     openstack_version: 'queens'