# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
set -e
+source ./cache.sh
source ./variables.sh
-pushd images > /dev/null
+pushd ${BUILD_DIR} > /dev/null
cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
##### Adding OpenDaylight to overcloud #####
###############################################
-# tar up fdio networking-odl
-rm -rf fds
-git clone https://gerrit.opnfv.org/gerrit/fds
-pushd fds > /dev/null
-tar -czvf ../networking-odl.tar.gz networking-odl
-popd > /dev/null
-
-# Beryllium Repo
-cat > /tmp/opendaylight.repo << EOF
-[opendaylight-4-release]
-name=CentOS CBS OpenDaylight Beryllium repository
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-release/\$basearch/os/
+cat > ${BUILD_DIR}/opendaylight.repo << EOF
+[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 > /tmp/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 > /tmp/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/
+cat > ${BUILD_DIR}/opendaylight_master.repo << EOF
+[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
-#BGPVPN Repo
-cat > /tmp/bgpvpn.repo << EOF
-[bgpvpn]
-name=bgpvpn
-baseurl=https://trunk.rdoproject.org/centos7/consistent/
-includepkgs=python2-networking-bgpvpn
-enabled=1
-gpgcheck=0
-priority=1
-EOF
+# OpenDaylight Puppet Module
+rm -rf 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-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
+populate_cache http://artifacts.opnfv.org/netready/$gluon_rpm
+
+#Gluon puppet module
+rm -rf netready
+git clone -b master https://gerrit.opnfv.org/gerrit/netready
+pushd netready/ > /dev/null
+git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz
+popd > /dev/null
-# SDNVPN - Copy tunnel setup script
-curl -fO https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
+# 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
-# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
-# install Honeycomb
-LIBGUESTFS_BACKEND=direct virt-customize \
- --upload networking-odl.tar.gz:/root/ \
- --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
- --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
- --upload /tmp/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \
- --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \
- --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
+# install quagga/zrpc
+# 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 "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 \
--install opendaylight,python-networking-odl \
- --upload /tmp/bgpvpn.repo:/etc/yum.repos.d/bgpvpn.repo \
- --install python-networking-bgpvpn \
- --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
- --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
- --install honeycomb \
- --upload ./setup_TEPs.py:/tmp \
+ --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 python-click \
+ --upload ${CACHE_DIR}/$gluon_rpm:/root/\
+ --install /root/$gluon_rpm \
+ --run-command "yum downgrade -y python-zmq-14.3.1" \
+ --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
- # Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased
- #--upload ../opnfv-puppet-tripleo.patch:/tmp \
- #--run-command "cd /etc/puppet/modules/tripleo && patch -Np1 < /tmp/opnfv-puppet-tripleo.patch" \
+# Arch dependent on x86
+if [ "$(uname -i)" == 'x86_64' ]; then
-## WORK AROUND
-## when OpenDaylight lands in upstream RDO manager this can be removed
+# Download quagga/zrpc rpms
+populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
-# upload the opendaylight puppet module
-rm -rf puppet-opendaylight
-git clone -b master https://github.com/dfarrell07/puppet-opendaylight
-pushd puppet-opendaylight > /dev/null
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
-popd > /dev/null
-LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
- --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
- -a overcloud-full-opendaylight_build.qcow2
+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
Code Review / apex.git / blobdiff