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