commit 7630eaf0bc1bc4e59284ae722f1961738d78f11c
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Mon Dec 17 16:33:14 2018 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Mon Dec 17 16:33:14 2018 +0400
tree 3c709d8443f168e2f6d1741b557b30b7a7a9a1f4
parent 42e769532f7ae0e17fd0b28c9807eb444cf33c6f

Update mirrors from apt to mirror.mirantis.com

Change-Id: I856859a7bf2a1cc2d12fcb965e3b69c2a580cd2f

mirror-image/run.example.sh

diff --git a/mirror-image/run.example.sh b/mirror-image/run.example.sh
index 2a1a42c..5839cb2 100755
--- a/mirror-image/run.example.sh
+++ b/mirror-image/run.example.sh
@@ -25,8 +25,8 @@
 export UBUNTU_BASEURL="http://mirror.mirantis.com/${BINARY_MCP_VERSION}/ubuntu/"
 export SALTSTACK_REPO="http://mirror.mirantis.com/${BINARY_MCP_VERSION}/saltstack-2017.7/xenial xenial main"
 export SALTSTACK_GPG="http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub"
-export APT_MIRANTIS_GPG="http://apt.mirantis.com/public.gpg"
-export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ ${BINARY_MCP_VERSION} salt "
+export APT_MIRANTIS_SALT_GPG="http://mirror.mirantis.com/${MCP_VERSION}/salt-formulas/xenial/archive-salt-formulas.key"
+export APT_MIRANTIS_SALT_REPO="http://mirror.mirantis.com/${MCP_VERSION}/salt-formulas/xenial xenial main"
 #
 export GIT_SALT_FORMULAS_SCRIPTS="https://gerrit.mcp.mirantis.com/salt-formulas/salt-formulas-scripts"
 export SCRIPTS_REF="master"

mirror-image/template.json

diff --git a/mirror-image/template.json b/mirror-image/template.json
index 4469b8a..f7e668b 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -14,7 +14,7 @@
     "ubuntu_baseurl": "{{ env `UBUNTU_BASEURL` }}",
     "saltstack_gpg": "{{ env `SALTSTACK_GPG` }}",
     "saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
-    "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
+    "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_SALT_GPG` }}",
     "apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
     "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
     "os_flavor": "27574e15-f031-4b78-a82d-4cef3aea9442",
@@ -53,7 +53,7 @@
         "UBUNTU_BASEURL={{ user `ubuntu_baseurl` }}",
         "SALTSTACK_GPG={{ user `saltstack_gpg` }}",
         "SALTSTACK_REPO={{ user `saltstack_repo` }}",
-        "APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
+        "APT_MIRANTIS_SALT_GPG={{ user `apt_mirantis_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
         "PACKER_OFFLINE_BUILD=true"