commit 0955f72ea373f1136fdd092c9ee6b3e1b566ab4d
author azvyagintsev <azvyagintsev@mirantis.com> Fri Jul 13 21:01:19 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Mon Jul 16 11:29:17 2018 +0300
tree a88a40d0d119a28118a2126224c8d4c8ae65d1ce
parent dd137848fcd2d71bdbde9824d700e9cf7ba1ef4b

add WA for aptly-get-key issue

Change-Id: I5b96e20c3ff2259dbd65a9730e8f98ea9c0748bc

mirror-image/scripts/mirrors.sh

diff --git a/mirror-image/scripts/mirrors.sh b/mirror-image/scripts/mirrors.sh
index 8e4bcb3..83499de 100644
--- a/mirror-image/scripts/mirrors.sh
+++ b/mirror-image/scripts/mirrors.sh
@@ -5,9 +5,13 @@
 #aptly
 # FIXME: remove duplicate run after fix: PROD-21387
 # RC: aptly may fail to import gpg key's randomly(most probably,nw issue), so lets run it twice
-salt-call ${SALT_OPTS} state.sls aptly.server || salt-call ${SALT_OPTS} state.sls aptly.server
+salt-call ${SALT_OPTS} state.sls aptly.server || true
+sleep 5
+salt-call ${SALT_OPTS} state.sls aptly.server
 salt-call ${SALT_OPTS} state.sls aptly.publisher
-salt-call ${SALT_OPTS} state.sls aptly || salt-call ${SALT_OPTS} state.sls aptly
+salt-call ${SALT_OPTS} state.sls aptly || true
+sleep 5
+salt-call ${SALT_OPTS} state.sls aptly
 aptly_mirror_update.sh -sv
 aptly-publisher --url http://10.99.0.1:18084 --timeout=1200 publish -v -d -c /etc/aptly/publisher.yaml --architectures amd64 --recreate --force-overwrite
 

mirror-image/template.json

diff --git a/mirror-image/template.json b/mirror-image/template.json
index 8665bb5..6c5f7b5 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -2,7 +2,7 @@
   "variables": {
     "user": "root",
     "password": "r00tme",
-    "disk_size": "700000",
+    "disk_size": "60000",
     "images_cache": "{{ env `PACKER_IMAGES_CACHE` }}",
     "do_api_token": "{{ env `DO_API_TOKEN` }}",
     "image_name": "{{ env `IMAGE_NAME` }}",