commit 10b3b1ccd8d5e8eea0236413ffa4ccd8640cdabe
author Denis Egorenko <degorenko@mirantis.com> Mon Nov 26 17:17:24 2018 +0400
committer Denis Egorenko <degorenko@mirantis.com> Mon Nov 26 18:02:14 2018 +0400
tree c8474a2182b23cb7801550b53cf555de393f8ff5
parent 7ba57ed6dba3b8fb9f0b1c9b028d016b32f7d214

Move aptly docker images default values to defaults.docker_images

Change-Id: Ifc88a3bef77b7b5998f5ce927f7bad00c589c9ac
Related-bug: PROD-25248

aptly/client/publisher.yml

diff --git a/aptly/client/publisher.yml b/aptly/client/publisher.yml
index 050bcea..f30a8ef 100644
--- a/aptly/client/publisher.yml
+++ b/aptly/client/publisher.yml
@@ -6,4 +6,4 @@
       enabled: true
       source:
         engine: docker
-        image: mirantis/aptly-publisher
+        image: ${_param:docker_image_aptly:publisher}

aptly/server/docker.yml

diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 11ebc66..29459c3 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -8,8 +8,6 @@
     aptly_gpg_private_key: none
     aptly_server_mirror_sources: false
     aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
-    docker_image_aptly:
-      base: mirantis/aptly
   aptly:
     server:
       enabled: true

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index d6ee808..5093781 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -39,3 +39,9 @@
     # keycloak
     docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
     docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
+    # aptly
+    docker_image_aptly:
+      base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
+      api: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-api:${_param:mcp_version}"
+      public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:${_param:mcp_version}"
+      publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:${_param:mcp_version}"

docker/swarm/stack/aptly.yml

diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index a7928f7..d5b8362 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -3,12 +3,6 @@
 parameters:
   _param:
     docker_stack_aptly_public_replicas: 3
-    docker_image_aptly:
-      # This image is temporary replacement for mirantis/aptly-api because of acquire_by_hash bug
-      # https://github.com/smira/aptly/pull/697. We waiting for new release of aptly
-      api: breton/aptly-api
-      #api: mirantis/aptly-api
-      public: mirantis/aptly-public
   docker:
     client:
       stack: