X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-opendaylight.sh;h=ed3f539e07068b334b4886f62ec78f6247b35d39;hb=cbac19523534a3ffe767c6e44015302222d88a0a;hp=7e4f91d88a3fb43f6877d6dfe6c6b482529394c5;hpb=2dea739e3ac5baf1bf247cfbf080527981b42aa0;p=apex.git diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 7e4f91d8..ed3f539e 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -19,48 +19,39 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2 ##### Adding OpenDaylight to overcloud ##### ############################################### -# Beryllium Repo cat > ${BUILD_DIR}/opendaylight.repo << EOF -[opendaylight-4-release] -name=CentOS CBS OpenDaylight Beryllium repository -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-release/\$basearch/os/ +[opendaylight-6-release] +name=CentOS CBS OpenDaylight Carbon repository +baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/\$basearch/os/ enabled=1 gpgcheck=0 EOF -# Boron Repo -cat > ${BUILD_DIR}/opendaylight_boron.repo << EOF -[opendaylight-5-release] -name=CentOS CBS OpenDaylight Boron repository -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-5-testing/\$basearch/os/ +cat > ${BUILD_DIR}/opendaylight_nitrogen.repo << EOF +[opendaylight-7-release] +name=CentOS CBS OpenDaylight Nitrogen repository +baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-7-testing/\$basearch/os/ enabled=1 gpgcheck=0 EOF -# Master Repo cat > ${BUILD_DIR}/opendaylight_master.repo << EOF -[opendaylight-6-release] -name=CentOS CBS OpenDaylight Carbon repository -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/\$basearch/os/ +[opendaylight-master] +name=OpenDaylight master repository +baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-x86_64-devel/ enabled=1 gpgcheck=0 EOF # OpenDaylight Puppet Module rm -rf puppet-opendaylight -git clone -b master https://github.com/dfarrell07/puppet-opendaylight +git clone -b stable/carbon https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight pushd puppet-opendaylight > /dev/null -git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight.tar.gz -popd > /dev/null - -# cache networking-BGPVPN -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm -pushd ${CACHE_DIR}/ > /dev/null -tar czf ${BUILD_DIR}/networking-bgpvpn.tar.gz *networking-bgpvpn* +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz +git checkout master +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz +git checkout stable/nitrogen +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz popd > /dev/null # cache gluon @@ -73,45 +64,52 @@ pushd netready/ > /dev/null git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz popd > /dev/null -# Tar up all quagga/zrpc rpms -pushd ${QUAGGA_RPMS_DIR}/rpmbuild/RPMS > /dev/null -tar --transform "s/^x86_64/quagga/" -czvf ${BUILD_DIR}/quagga.tar.gz x86_64/ -popd > /dev/null +# Download ODL netvirt for VPP +populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm # install ODL packages # Patch in OPNFV custom puppet-tripleO -# install Honeycomb # install quagga/zrpc -LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${BUILD_DIR}/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \ - --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \ +# upload neutron patch for generic NS linux interface driver + OVS for external networks +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \ - --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \ + --run-command "mkdir -p /root/master" \ + --run-command "yumdownloader --destdir=/root/master opendaylight" \ + --upload ${BUILD_DIR}/opendaylight_nitrogen.repo:/etc/yum.repos.d/opendaylight.repo \ + --run-command "mkdir -p /root/nitrogen" \ + --run-command "yum install --downloadonly --downloaddir=/root/nitrogen opendaylight" \ --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ - --run-command "wget ${fdio_l2_uri_base}/honeycomb-1.17.04-2439.noarch.rpm -O /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \ - --run-command "wget ${fdio_l2_uri_base}/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm -O /root/fdio_l2/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm" \ --install opendaylight,python-networking-odl \ - --install honeycomb \ - --upload ${BUILD_ROOT}/honeycomb-jar-replace.sh:/root/ \ - --run-command "/root/honeycomb-jar-replace.sh" \ - --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ - --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \ - --run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \ - --run-command "touch /etc/neutron/networking_bgpvpn.conf" \ + --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-carbon.tar.gz" \ + --upload ${BUILD_DIR}/puppet-opendaylight-master.tar.gz:/root/ \ + --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/root/ \ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \ - --install epel-release \ --install python-click \ --upload ${CACHE_DIR}/$gluon_rpm:/root/\ --install /root/$gluon_rpm \ - --upload ${BUILD_DIR}/quagga.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf quagga.tar.gz" \ --run-command "yum downgrade -y python-zmq-14.3.1" \ - --install zeromq-4.1.4,zeromq-devel-4.1.4 \ - --install capnproto-devel,capnproto-libs,capnproto \ + --install capnproto-libs,capnproto \ + --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \ + -a overcloud-full-opendaylight_build.qcow2 + +# Arch dependent on x86 +if [ "$(uname -i)" == 'x86_64' ]; then + +# Download quagga/zrpc rpms +populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz + +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ + --install zeromq-4.1.4 \ + --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \ + --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \ + --run-command "sudo usermod -a -G quaggavt quagga" \ -a overcloud-full-opendaylight_build.qcow2 +fi -mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 +LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 +rm -f overcloud-full-opendaylight_build.qcow2 popd > /dev/null