Merge "Move few docker_images* under 'defaults' logic"
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}"
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'
diff --git a/docker/client/compose/init.yml b/docker/client/compose/init.yml
index efeeadd..5412df8 100644
--- a/docker/client/compose/init.yml
+++ b/docker/client/compose/init.yml
@@ -1,8 +1,6 @@
classes:
- system.docker.client
parameters:
- _param:
- docker_image_compose: docker/compose:1.17.1
docker:
client:
compose:
diff --git a/docker/client/compose/service/gerrit.yml b/docker/client/compose/service/gerrit.yml
index 50d933b..69b2a2c 100644
--- a/docker/client/compose/service/gerrit.yml
+++ b/docker/client/compose/service/gerrit.yml
@@ -2,8 +2,6 @@
- system.docker.client.compose
parameters:
_param:
- docker_image_gerrit: mirantis/gerrit:2.13.6
- docker_image_mysql: mirantis/mysql:5.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
diff --git a/docker/swarm/stack/docker.yml b/docker/swarm/stack/docker.yml
index f861718..3800b56 100644
--- a/docker/swarm/stack/docker.yml
+++ b/docker/swarm/stack/docker.yml
@@ -1,7 +1,5 @@
parameters:
_param:
- docker_image_registry: registry:2
- docker_image_visualizer: dockersamples/visualizer
docker_stack_registry_replicas: 3
docker:
client:
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index ad3ea6d..7985217 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -2,8 +2,6 @@
- system.docker
parameters:
_param:
- docker_image_gerrit: mirantis/gerrit:2.13.6
- docker_image_mysql: mirantis/mysql:5.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index fb926e8..0cb8c43 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -1,7 +1,6 @@
parameters:
_param:
docker_janitor_monkey_replicas: 1
- docker_image_mongodb: library/mongo:3.4
docker_mongodb_admin_username: admin
docker_mongodb_admin_password: password
docker_image_janitor_monkey: ${_param:mcp_docker_registry}/mirantis/oss/janitor-monkey
@@ -71,7 +70,7 @@
simianarmy.janitor.notification.oss.application_id: ${_param:janitor_monkey_notification_oss_application_id}
service:
cleanup-service-mongodb:
- image: ${_param:docker_image_mongodb}
+ image: library/mongo:3.4
deploy:
replicas: ${_param:docker_janitor_monkey_replicas}
restart_policy:
diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index f4866f1..14e8b37 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- docker_image_openldap: osixia/openldap:1.1.8
- docker_image_phpldapadmin: mirantis/phpldapadmin:0.6.12
docker:
client:
stack:
diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 42ebf8f..192b82c 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -1,7 +1,6 @@
parameters:
_param:
docker_postgresql_replicas: 1
- docker_image_postgresql: library/postgres:9.6
postgresql_bind_host: postgresql-db
postgresql_bind_port: ${_param:haproxy_postgresql_bind_port}
postgresql_ssl:
@@ -29,4 +28,4 @@
network:
default:
external:
- name: oss_backend
\ No newline at end of file
+ name: oss_backend