From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/undercloud.sh | 67 ----------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100755 build/undercloud.sh (limited to 'build/undercloud.sh') diff --git a/build/undercloud.sh b/build/undercloud.sh deleted file mode 100755 index 6bb8ac90..00000000 --- a/build/undercloud.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -xe -source ./cache.sh -source ./variables.sh - -populate_cache "$rdo_images_uri/undercloud.qcow2" -if [ ! -d "$BUILD_DIR" ]; then mkdir ${BUILD_DIR}; fi -cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2 - -pushd ${BUILD_DIR} > /dev/null - -# prep apex-tht for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates -pushd apex-tripleo-heat-templates > /dev/null -git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz -popd > /dev/null - -# inject rt_kvm kernel rpm name into the enable file -sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml - -# grab latest calipso -populate_cache $calipso_uri_base/$calipso_script - -# Turn off GSSAPI Auth in sshd -# installing forked apex-tht -# enabling ceph OSDs to live on the controller -# seeding configuration files specific to OPNFV -# Add performance image scripts -LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ - --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ - --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \ - --install "openstack-utils" \ - --install "ceph-common" \ - --install openstack-nova-compute \ - --install epel-release \ - --install python34,python34-pip \ - --install openstack-ironic-inspector,subunit-filters,docker-distribution,openstack-tripleo-validations \ - --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf apex-tripleo-heat-templates.tar.gz" \ - --run-command "sed -i '/ControllerEnableCephStorage/c\\ ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ - --run-command "sed -i '/ComputeEnableCephStorage/c\\ ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \ - --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ - --upload ${BUILD_ROOT}/opnfv-environment.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/first-boot.yaml:/home/stack/ \ - --upload ${BUILD_DIR}/enable_rt_kvm.yaml:/usr/share/openstack-tripleo-heat-templates/environments/ \ - --upload ${BUILD_ROOT}/ovs-dpdk-preconfig.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \ - --uninstall "libvirt-client" \ - --upload ${CACHE_DIR}/${calipso_script}:/root/ \ - --install "libguestfs-tools" \ - --install "python-tackerclient" \ - --run-command "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo" \ - --install yum-utils,lvm2,device-mapper-persistent-data \ - -a undercloud_build.qcow2 - -mv -f undercloud_build.qcow2 undercloud.qcow2 -popd > /dev/null -- cgit 1.2.3-korg