diff options
| -rw-r--r-- | apex/builders/undercloud_builder.py | 14 | ||||
| -rw-r--r-- | apex/common/constants.py | 1 | ||||
| -rw-r--r-- | apex/deploy.py | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index 4efd00d5..9c61b87c 100644 --- a/apex/builders/undercloud_builder.py +++ b/apex/builders/undercloud_builder.py @@ -59,3 +59,17 @@ def inject_calipso_installer(tmp_dir, image): # TODO(trozet): add unit testing for calipso injector # TODO(trozet): add rest of build for undercloud here as well + + +def update_repos(image, branch): + virt_ops = [ + {con.VIRT_RUN_CMD: "rm -f /etc/yum.repos.d/delorean*"}, + {con.VIRT_RUN_CMD: "yum-config-manager --add-repo " + "https://trunk.rdoproject.org/centos7/{}" + "/delorean.repo".format(con.RDO_TAG)}, + {con.VIRT_RUN_CMD: "yum clean all"}, + {con.VIRT_INSTALL: "python2-tripleo-repos"}, + {con.VIRT_RUN_CMD: "tripleo-repos -b {} {} ceph".format(branch, + con.RDO_TAG)} + ] + virt_utils.virt_customize(virt_ops, image) diff --git a/apex/common/constants.py b/apex/common/constants.py index 02fafbd0..1a94f16b 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -53,6 +53,7 @@ PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \ DEBUG_OVERCLOUD_PW = 'opnfvapex' NET_ENV_FILE = 'network-environment.yaml' DEPLOY_TIMEOUT = 120 +RDO_TAG = 'current-tripleo' UPSTREAM_RDO = 'https://images.rdoproject.org/{}/delorean/current' \ '-tripleo-rdo/'.format(DEFAULT_OS_VERSION) OPENSTACK_GERRIT = 'https://review.openstack.org' diff --git a/apex/deploy.py b/apex/deploy.py index 64374a9a..fa468457 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -392,6 +392,9 @@ def main(): uc_fetch_img = os.path.join(args.image_dir, 'undercloud.qcow2') shutil.copyfile(uc_fetch_img, uc_image) # prep undercloud with required packages + if platform.machine() != 'aarch64': + uc_builder.update_repos(image=uc_image, + branch=branch.replace('stable/', '')) uc_builder.add_upstream_packages(uc_image) uc_builder.inject_calipso_installer(APEX_TEMP_DIR, uc_image) # upgrade OVS in undercloud |