From 3317286a3b39b125fb8895b1e2bfa2f0d230de78 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 6 Nov 2018 09:56:21 -0500 Subject: [PATCH] Fix Undercloud URL path Modify the URL path for undercloud disk image to opnfv artifacts. The undercloud image was removed from upstream TripleO, so we need to use the latest known good version for Gambia release, stored in OPNFV artifacts. In the future we will remove downloading undercloud image and just use the overcloud image for undercloud. Change-Id: I17a3bbaf67d55de05c195712d7fee6e89676bc16 Signed-off-by: Tim Rozet --- apex/common/constants.py | 1 + apex/deploy.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apex/common/constants.py b/apex/common/constants.py index 49534965..790a9e30 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -71,6 +71,7 @@ DOCKERHUB_OOO = 'https://registry.hub.docker.com/v2/repositories' \ '/tripleomaster/' KUBESPRAY_URL = 'https://github.com/kubernetes-incubator/kubespray.git' OPNFV_ARTIFACTS = 'http://storage.googleapis.com/artifacts.opnfv.org' +UNDERCLOUD_URL = "{}/apex/gambia/".format(OPNFV_ARTIFACTS) CUSTOM_OVS = '{}/apex/random/openvswitch-2.9.0-9.el7fdn.x86_64.' \ 'rpm'.format(OPNFV_ARTIFACTS) diff --git a/apex/deploy.py b/apex/deploy.py index dab6bd1e..bc35e91f 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -377,10 +377,15 @@ def main(): args.image_dir = os.path.join(args.image_dir, os_version) upstream_url = constants.UPSTREAM_RDO.replace( constants.DEFAULT_OS_VERSION, os_version) - upstream_targets = ['overcloud-full.tar', 'undercloud.qcow2'] + upstream_targets = ['overcloud-full.tar'] utils.fetch_upstream_and_unpack(args.image_dir, upstream_url, upstream_targets, fetch=not args.no_fetch) + upstream_targets = ['undercloud.qcow2'] + utils.fetch_upstream_and_unpack(args.image_dir, + constants.UNDERCLOUD_URL, + upstream_targets, + fetch=not args.no_fetch) sdn_image = os.path.join(args.image_dir, 'overcloud-full.qcow2') # copy undercloud so we don't taint upstream fetch uc_image = os.path.join(args.image_dir, 'undercloud_mod.qcow2') -- 2.16.6