From 493c989cfc009d823af8db3e5f58954418bf4354 Mon Sep 17 00:00:00 2001 From: Charalampos Kominos Date: Fri, 16 Nov 2018 13:00:05 +0100 Subject: Use undercloud.qcow2 for UC in aarch64 Commit 1817e62 introduced a side effect for aarch64. The undercloud and overcloud images are not the same for aarch64 due to differences in the partition table and they are not provided by RH or tripleo. Helper scripts to build them are in this repository. For aarch64 undercloud.qcow2,overcloud.tar and ironic-python-agent.tar Are required. Change-Id: Ia79de801e3cb33bbcc78cdc714cb1745c1b57d6b Signed-off-by: Charalampos Kominos --- apex/deploy.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apex/deploy.py b/apex/deploy.py index 670fb6bd..bb011f92 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -395,7 +395,10 @@ 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', 'ironic-python-agent.tar'] + if platform.machine() == 'aarch64': + upstream_targets.append('undercloud.qcow2') utils.fetch_upstream_and_unpack(args.image_dir, upstream_url, upstream_targets, fetch=not args.no_fetch) @@ -406,7 +409,10 @@ def main(): for tmp_file in UC_DISK_FILES: shutil.copyfile(os.path.join(args.image_dir, tmp_file), os.path.join(APEX_TEMP_DIR, tmp_file)) - sdn_image = os.path.join(args.image_dir, 'overcloud-full.qcow2') + if platform.machine() == 'aarch64': + sdn_image = os.path.join(args.image_dir, 'undercloud.qcow2') + else: + 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') uc_fetch_img = sdn_image @@ -486,8 +492,12 @@ def main(): opnfv_env, net_env_target, APEX_TEMP_DIR) if not args.virtual: oc_deploy.LOOP_DEVICE_SIZE = "50G" + if platform.machine() == 'aarch64': + oc_image = os.path.join(args.image_dir, 'overcloud-full.qcow2') + else: + oc_image = sdn_image patched_containers = oc_deploy.prep_image( - deploy_settings, net_settings, sdn_image, APEX_TEMP_DIR, + deploy_settings, net_settings, oc_image, APEX_TEMP_DIR, root_pw=root_pw, docker_tag=tag, patches=patches['overcloud']) oc_deploy.create_deploy_cmd(deploy_settings, net_settings, inventory, -- cgit 1.2.3-korg