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/overcloud-full.sh | 158 ------------------------------------------------ 1 file changed, 158 deletions(-) delete mode 100755 build/overcloud-full.sh (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh deleted file mode 100755 index f7d55e58..00000000 --- a/build/overcloud-full.sh +++ /dev/null @@ -1,158 +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 -source ./barometer-install.sh - -populate_cache "$rdo_images_uri/overcloud-full.tar" - -if [ ! -d ${BUILD_DIR} ]; then mkdir ${BUILD_DIR}; fi -tar -xf ${CACHE_DIR}/overcloud-full.tar -C ${BUILD_DIR}/ -mv -f ${BUILD_DIR}/overcloud-full.qcow2 ${BUILD_DIR}/overcloud-full_build.qcow2 - -########################################################## -##### Prep initial overcloud image with common deps ##### -########################################################## - -pushd ${BUILD_DIR} > /dev/null - -# prep opnfv-puppet-tripleo for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo -pushd apex-puppet-tripleo > /dev/null -git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/apex-puppet-tripleo.tar.gz -popd > /dev/null - -# download customized os-net-config -python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config -pushd apex-os-net-config/os_net_config > /dev/null -git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/apex-os-net-config.tar.gz -popd > /dev/null - -# tar up vsperf -rm -rf vsperf vsperf.tar.gz -git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf -tar czf vsperf.tar.gz vsperf - -# Increase disk size by 1500MB to accommodate more packages -qemu-img resize overcloud-full_build.qcow2 +1500M - -# expand file system to max disk size -# installing forked apex-puppet-tripleo -# upload neutron port data plane status -LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ - --run-command "curl -f https://trunk.rdoproject.org/centos7-pike/delorean-deps.repo > /etc/yum.repos.d/delorean-deps.repo" \ - --run-command "xfs_growfs /dev/sda" \ - --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \ - --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf apex-puppet-tripleo.tar.gz" \ - --upload ${BUILD_DIR}/apex-os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ - --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf apex-os-net-config.tar.gz" \ - --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ - --install epel-release \ - --install unzip \ - --upload ${BUILD_DIR}/vsperf.tar.gz:/var/opt \ - --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ - --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ - --install patch \ - --upload ${BUILD_ROOT}/patches/neutron_lib_dps.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${BUILD_ROOT}/patches/neutron_server_dps.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${BUILD_ROOT}/patches/neutron_openstacksdk_dps.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ - --install openstack-utils \ - -a overcloud-full_build.qcow2 -# --upload ${BUILD_ROOT}/patches/puppet-neutron-add-external_network_bridge-option.patch:/usr/share/openstack-puppet/modules/neutron/ \ -# --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-external_network_bridge-option.patch" \ - - -# Arch dependent on x86 -if [ "$(uname -i)" == 'x86_64' ]; then -dpdk_pkg_str='' -for package in ${dpdk_rpms[@]}; do - wget "$dpdk_uri_base/$package" - dpdk_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/dpdk_rpms" -done - -# tar up the fd.io module -rm -rf puppet-fdio -git clone https://git.fd.io/puppet-fdio -pushd puppet-fdio > /dev/null -git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz -popd > /dev/null - -# FD.IO Repo -cat > ${BUILD_DIR}/fdio.repo << EOF -[fdio-1710] -name=fd.io packages -baseurl=https://nexus.fd.io/content/repositories/fd.io.stable.1710.centos7/ -enabled=1 -gpgcheck=0 -EOF - -vpp_nosdn_pkg_str='' -for package in ${nosdn_vpp_rpms[@]}; do - wget $package - vpp_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/nosdn_vpp_rpms" -done - -# Kubernetes Repo -cat > ${BUILD_DIR}/kubernetes.repo << EOF -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=0 -repo_gpgcheck=0 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -EOF - -# Get Real Time Kernel from kvm4nfv -populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm - -# upload dpdk rpms but do not install -# install fd.io yum repo and packages -# upload puppet fdio -# git clone vsperf into the overcloud image -# upload the rt_kvm kernel -LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ - --run-command "mkdir /root/dpdk_rpms" \ - $dpdk_pkg_str \ - --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \ - --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ - --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/ \ - --run-command "mkdir /root/nosdn_vpp_rpms" \ - $vpp_nosdn_pkg_str \ - --upload ${BUILD_DIR}/kubernetes.repo:/etc/yum.repos.d/ \ - --run-command "mkdir /root/fdio" \ - --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/nosdn_vpp_rpms \ - --install honeycomb,vpp-plugins,vpp,vpp-lib,vpp-api-python \ - --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ - --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ - --run-command "mkdir /root/ovs28" \ - --run-command "yumdownloader --destdir=/root/ovs28 openvswitch*2.8* python-openvswitch-2.8*" \ - --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \ - --install python-etcd,puppet-etcd \ - --install patch \ - --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \ - --upload ${BUILD_ROOT}/patches/puppet-ceph.patch:/etc/puppet/modules/ceph/ \ - --run-command "cd /etc/puppet/modules/ceph && patch -p1 < puppet-ceph.patch" \ - -a overcloud-full_build.qcow2 - - # upload and install barometer packages - barometer_pkgs overcloud-full_build.qcow2 - -fi # end x86_64 specific items - -mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 -popd > /dev/null -- cgit 1.2.3-korg