From 0c2284b9aa730bc1143093f13fb35ba0fa879189 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 17 Oct 2018 11:17:41 -0400 Subject: Fixes undercloud accidentally using wrong images/containers Our undercloud initial install was failing with queens because the --use-heat arg does not work the same way as master/rocky. Therefore the undercloud install would fail, and then try to reinstall on the next ansible task. This one would succeed, via container installation because we were using the wrong undercloud/overcloud disk images. Change-Id: Ifb829aeeec991ba6dbe582fda3e9ee6b9bc733df Signed-off-by: Tim Rozet --- apex/builders/common_builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apex/builders/common_builder.py') diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py index b8894ec1..d3ddae48 100644 --- a/apex/builders/common_builder.py +++ b/apex/builders/common_builder.py @@ -110,7 +110,8 @@ def is_patch_promoted(change, branch, docker_image=None): # Patch applies to overcloud/undercloud if docker_image is None: oc_url = urllib.parse.urljoin( - con.UPSTREAM_RDO.replace('master', branch), 'overcloud-full.tar') + con.UPSTREAM_RDO.replace(con.DEFAULT_OS_VERSION, + branch), 'overcloud-full.tar') oc_mtime = utils.get_url_modified_date(oc_url) if oc_mtime > submitted_date: logging.debug("oc image was last modified at {}, which is" -- cgit 1.2.3-korg