diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-24 12:46:55 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-09-06 21:52:10 -0400 |
| commit | 70cade4f8df150281c16e72d9234fa3751f097c8 (patch) | |
| tree | f9fa7530926511d202bc042147eac54fc47dbc29 /apex | |
| parent | 4301e4cb3bd6f62caec575d30e8588b72ac626c7 (diff) | |
Updates Calipso deploy settings
Change-Id: Ibfbd08dc2fa5fca95668fd0590707cfebd92099f
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/builders/undercloud_builder.py | 21 | ||||
| -rw-r--r-- | apex/common/constants.py | 2 | ||||
| -rw-r--r-- | apex/deploy.py | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index f82e79d1..4efd00d5 100644 --- a/apex/builders/undercloud_builder.py +++ b/apex/builders/undercloud_builder.py @@ -8,8 +8,11 @@ ############################################################################## # Used to modify undercloud qcow2 image +import logging +import os from apex.common import constants as con +from apex.common import utils from apex.virtual import utils as virt_utils @@ -21,6 +24,7 @@ def add_upstream_packages(image): """ virt_ops = list() pkgs = [ + 'epel-release', 'openstack-utils', 'ceph-common', 'python2-networking-sfc', @@ -37,4 +41,21 @@ def add_upstream_packages(image): virt_ops.append({con.VIRT_INSTALL: pkg}) virt_utils.virt_customize(virt_ops, image) + +def inject_calipso_installer(tmp_dir, image): + """ + Downloads calipso installer script from artifacts.opnfv.org + and puts it under /root/ for further installation process. + :return: + """ + calipso_file = os.path.basename(con.CALIPSO_INSTALLER_URL) + calipso_url = con.CALIPSO_INSTALLER_URL.replace(calipso_file, '') + utils.fetch_upstream_and_unpack(tmp_dir, calipso_url, [calipso_file]) + + virt_ops = [ + {con.VIRT_UPLOAD: "{}/{}:/root/".format(tmp_dir, calipso_file)}] + virt_utils.virt_customize(virt_ops, image) + logging.info("Calipso injected into {}".format(image)) + +# TODO(trozet): add unit testing for calipso injector # TODO(trozet): add rest of build for undercloud here as well diff --git a/apex/common/constants.py b/apex/common/constants.py index 8c65e68b..0475615a 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -76,3 +76,5 @@ CUSTOM_OVS = '{}/apex/random/openvswitch-2.9.0-9.el7fdn.x86_64.' \ OVS_URL = "http://openvswitch.org/releases/openvswitch-2.9.2.tar.gz" QUAGGA_URL = "{}/sdnvpn/quagga/quagga-4.tar.gz".format(OPNFV_ARTIFACTS) +CALIPSO_INSTALLER_URL = "https://raw.githubusercontent.com/opnfv/calipso" \ + "/master/app/install/calipso-installer.py" diff --git a/apex/deploy.py b/apex/deploy.py index 531c9bfa..dab6bd1e 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -388,6 +388,7 @@ def main(): shutil.copyfile(uc_fetch_img, uc_image) # prep undercloud with required packages uc_builder.add_upstream_packages(uc_image) + uc_builder.inject_calipso_installer(APEX_TEMP_DIR, uc_image) # add patches from upstream to undercloud and overcloud logging.info('Adding patches to undercloud') patches = deployment.determine_patches() |