Update Heat template for environment
* update docker_ee_url default value
* always cache ucp images
Related-Prod: PRODX-39329
Change-Id: Ifb8f075d3148fa3421f99437284c8c781cb91180
diff --git a/de/heat-templates/env/main-wrkr5-rack1-cmp1-rack2-cmp1.yaml b/de/heat-templates/env/main-wrkr5-rack1-cmp1-rack2-cmp1.yaml
index 9b0177f..49067be 100644
--- a/de/heat-templates/env/main-wrkr5-rack1-cmp1-rack2-cmp1.yaml
+++ b/de/heat-templates/env/main-wrkr5-rack1-cmp1-rack2-cmp1.yaml
@@ -19,7 +19,7 @@
main_worker_flavor: 'system.compact.openstack.control.ephemeral'
rack01_cmp_flavor: 'system.compact.openstack.control.ephemeral'
docker_ucp_image: docker-dev-kaas-local.docker.mirantis.net/lcm/docker/ucp:3.3.3
- docker_ee_url: https://storebits.docker.com/ubuntu
+ docker_ee_url: https://repos.mirantis.com/ubuntu
docker_ee_release: stable-19.03
private_floating_interface: 'ens4'
default_interface: 'ens3'
diff --git a/de/heat-templates/env/main-wrkr5-rack1-cmp2-rack2-cmp2.yaml b/de/heat-templates/env/main-wrkr5-rack1-cmp2-rack2-cmp2.yaml
index 8654005..d34b485 100644
--- a/de/heat-templates/env/main-wrkr5-rack1-cmp2-rack2-cmp2.yaml
+++ b/de/heat-templates/env/main-wrkr5-rack1-cmp2-rack2-cmp2.yaml
@@ -19,7 +19,7 @@
main_worker_flavor: 'system.compact.openstack.control.ephemeral'
rack01_cmp_flavor: 'system.compact.openstack.control.ephemeral'
docker_ucp_image: docker-dev-kaas-local.docker.mirantis.net/lcm/docker/ucp:3.3.3
- docker_ee_url: https://storebits.docker.com/ubuntu
+ docker_ee_url: https://repos.mirantis.com/ubuntu
docker_ee_release: stable-19.03
private_floating_interface: 'ens4'
default_interface: 'ens3'
diff --git a/de/heat-templates/multirack.yaml b/de/heat-templates/multirack.yaml
index 72520d2..fcde637 100644
--- a/de/heat-templates/multirack.yaml
+++ b/de/heat-templates/multirack.yaml
@@ -124,7 +124,7 @@
default: 'system.compact.openstack.control'
docker_ee_url:
type: string
- default: 'https://storebits.docker.com/ubuntu'
+ default: 'https://repos.mirantis.com/ubuntu'
docker_ee_release:
type: string
default: 'stable-19.03'
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 6a8588b..7a7a835 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -329,12 +329,10 @@
pull_image "${DOCKER_UCP_IMAGE}"
local image_prefix=${DOCKER_UCP_IMAGE%/*}
- if [[ "$image_prefix" =~ .*\.mirantis\.net* ]]; then
- for image in $(docker container run --rm --name ucp -v /var/run/docker.sock:/var/run/docker.sock ${DOCKER_UCP_IMAGE} images --list); do
- pull_image "${image_prefix}/${image##*/}"
- docker tag ${image_prefix}/${image##*/} mirantis/${image##*/}
- done
- fi
+ for image in $(docker container run --rm --name ucp -v /var/run/docker.sock:/var/run/docker.sock ${DOCKER_UCP_IMAGE} images --list); do
+ pull_image "${image_prefix}/${image##*/}"
+ docker tag ${image_prefix}/${image##*/} mirantis/${image##*/}
+ done
}
function install_ucp {
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 1446d0a..d7be4a7 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -313,7 +313,7 @@
default: ''
docker_ee_url:
type: string
- default: 'https://storebits.docker.com/ubuntu'
+ default: 'https://repos.mirantis.com/ubuntu'
docker_ee_release:
type: string
default: 'stable-19.03'