X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=e1c58001304cc340e4d821ac71bffde73f7c6662;hb=refs%2Fchanges%2F21%2F35421%2F5;hp=0357ba0505ef324ecdcc348f74209cb1b9ec69de;hpb=5ac7ef296a6967f67e5d6a4a29117092c2f5dff4;p=apex.git diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 0357ba05..e1c58001 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -7,76 +7,53 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -set -e +set -xe source ./cache.sh source ./variables.sh source ./functions.sh populate_cache "$rdo_images_uri/overcloud-full.tar" -if [ ! -d images/ ]; then mkdir images; fi -tar -xf cache/overcloud-full.tar -C images/ -mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 - -# Add extra space to the overcloud image -qemu-img resize images/overcloud-full_build.qcow2 +1G -LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \ - --run-command 'resize2fs /dev/sda' +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 clone_fork opnfv-puppet-tripleo pushd opnfv-puppet-tripleo > /dev/null -git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar.gz +git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/opnfv-puppet-tripleo.tar.gz popd > /dev/null # download customized os-net-config -rm -fr os-net-config -git clone https://github.com/trozet/os-net-config.git -b stable/colorado -pushd os-net-config > /dev/null -pushd os_net_config > /dev/null -git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz +clone_fork os-net-config +pushd os-net-config/os_net_config > /dev/null +git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/os-net-config.tar.gz popd > /dev/null -popd > /dev/null - -pushd images > /dev/null dpdk_pkg_str='' for package in ${dpdk_rpms[@]}; do wget "$dpdk_uri_base/$package" - dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" -done - -fdio_pkg_str='' -for package in ${fdio_pkgs[@]}; do - wget "$fdio_uri_base/$package" - fdio_pkg_str+=" --upload $package:/root/fdio" + dpdk_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/dpdk_rpms" done # tar up the congress puppet module rm -rf puppet-congress -git clone -b stable/mitaka https://github.com/radez/puppet-congress +git clone https://github.com/openstack/puppet-congress pushd puppet-congress > /dev/null -git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz +git archive --format=tar.gz --prefix=congress/ HEAD > ${BUILD_DIR}/puppet-congress.tar.gz popd > /dev/null -# create fd.io yum repo file -#cat > /tmp/fdio-master.repo << EOF -#[fdio-master] -#name=fd.io master branch latest merge -#baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ -#enabled=1 -#gpgcheck=0 -#EOF - # tar up the fd.io module rm -rf puppet-fdio -git clone https://github.com/radez/puppet-fdio +git clone https://git.fd.io/puppet-fdio pushd puppet-fdio > /dev/null -git archive --format=tar.gz --prefix=fdio/ HEAD > ../puppet-fdio.tar.gz +git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz popd > /dev/null # tar up vsperf @@ -86,69 +63,110 @@ tar czf vsperf.tar.gz vsperf # tar up the tacker puppet module rm -rf puppet-tacker -# TODO move this back to radez puppet-tacker after PR is accepted -git clone -b fix_db_sync https://github.com/trozet/puppet-tacker +git clone https://github.com/openstack/puppet-tacker pushd puppet-tacker > /dev/null -git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz +git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz +popd > /dev/null + +# tar up the ovn puppet module +rm -rf puppet-ovn +git clone https://github.com/openstack/puppet-ovn +pushd puppet-ovn > /dev/null +git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz popd > /dev/null +# Get Real Time Kernel from kvm4nfv +populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm + +# packages frozen for fdio scenarios +fdio_pkg_str='' +for package in ${fdio_pkgs[@]}; do + wget "$package" + fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/" +done + +# tosca parser +rm -rf tosca-parser +git clone https://github.com/openstack/tosca-parser +tar czf tosca-parser.tar.gz tosca-parser + +# heat translator +rm -rf heat-translator +git clone https://github.com/openstack/heat-translator +tar czf heat-translator.tar.gz heat-translator + +# Increase disk size by 900MB to accommodate more packages +qemu-img resize overcloud-full_build.qcow2 +900MB + +# expand file system to max disk size # installing forked opnfv-puppet-tripleo -# enable connection tracking for protocal sctp # upload dpdk rpms but do not install -# enable connection tracking for protocal sctp # install the congress rpms # upload and explode the congress puppet module -# install doctor driver ## Can be removed in Newton # install fd.io yum repo and packages # upload puppet fdio # git clone vsperf into the overcloud image # upload the tacker puppet module and untar it +# install tacker +# upload the rt_kvm kernel LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ + --run-command "xfs_growfs /dev/sda" \ + --upload ${BUILD_DIR}/opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ + --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ + --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ - --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ --run-command "mkdir /root/dpdk_rpms" \ - --run-command "mkdir /root/fdio" \ $dpdk_pkg_str \ + --run-command "mkdir /root/fdio" \ + --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ $fdio_pkg_str \ - --upload ../networking-vpp.noarch.rpm:/root/fdio \ + --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "yum install -y etcd" \ - --run-command "pip install python-etcd" \ + --install python-etcd \ + --run-command "puppet module install cristifalcas/etcd" \ + --run-command "yum update -y puppet" \ --install "centos-release-qemu-ev" \ - --run-command "yum update -y" \ + --run-command "yum install -y qemu-kvm-ev-2.3.0-31.el7_2.21.1.x86_64" \ --run-command "yum remove -y qemu-system-x86" \ - --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ + --upload ${BUILD_DIR}/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 os-net-config.tar.gz" \ - --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \ - --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \ + --upload ${BUILD_DIR}/noarch/$congress_pkg:/root/ \ + --install /root/$congress_pkg \ --install "python2-congressclient" \ - --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ + --upload ${BUILD_DIR}/puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ - --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ - --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ - --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ - --run-command "tar zxvf /root/fdio/vpp_papi*.tar.gz -C /" \ --install unzip \ - --upload puppet-fdio.tar.gz:/etc/puppet/modules \ + --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ - --upload vsperf.tar.gz:/var/opt \ + --upload ${BUILD_DIR}/vsperf.tar.gz:/var/opt \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ - --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \ - --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \ - --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \ - --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \ - --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \ + --upload ${BUILD_DIR}/puppet-tacker.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \ - --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \ + --upload ${BUILD_DIR}/noarch/$tacker_pkg:/root/ \ + --install /root/$tacker_pkg \ + --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ + --install /root/$tackerclient_pkg \ + --upload ${BUILD_DIR}/tosca-parser.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf tosca-parser.tar.gz" \ + --run-command "cd /root/tosca-parser && python setup.py build && python setup.py install" \ + --upload ${BUILD_DIR}/heat-translator.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf heat-translator.tar.gz" \ + --run-command "cd /root/heat-translator && python setup.py build && python setup.py install" \ + --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \ + --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/ovs27" \ + --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ --run-command "pip install python-senlinclient" \ - --upload ../neutron/agent/interface/interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \ - --run-command "mkdir /root/fdio_neutron_l3" \ - --upload ../neutron/agent/l3/namespaces.py:/root/fdio_neutron_l3/ \ - --upload ../neutron/agent/l3/router_info.py:/root/fdio_neutron_l3/ \ + --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ + --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \ + --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2.patch" \ + --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" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2