Use RDO packaged networking-odl

[apex.git] / build / overcloud-opendaylight.sh

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 7e6c820..94417d1 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -10,7 +10,7 @@
 set -e
 source ./variables.sh
 
-pushd images > /dev/null
+pushd ${BUILD_DIR} > /dev/null
 
 cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
 
@@ -18,40 +18,71 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
 #####    Adding OpenDaylight to overcloud #####
 ###############################################
 
-cat > /tmp/opendaylight.repo << EOF
-[opendaylight]
-name=OpenDaylight \$releasever - \$basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-40-release/\$basearch/os/
+# 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/
 enabled=1
 gpgcheck=0
 EOF
 
-# install ODL packages
-# patch puppet-neutron: ODL Bug, Url check reports ODL is up but it's not quite up
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
-    --install opendaylight,python-networking-odl \
-    --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
-    -a overcloud-full-opendaylight_build.qcow2
-
-# install Jolokia for ODL HA
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ${odl_artifacts_cache}/jolokia.tar.gz:/tmp/ \
-    --run-command "tar -xvf /tmp/jolokia.tar.gz -C /opt/opendaylight/system/org" \
-    -a overcloud-full-opendaylight_build.qcow2
+# 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/
+enabled=1
+gpgcheck=0
+EOF
 
-## WORK AROUND
-## when OpenDaylight lands in upstream RDO manager this can be removed
+# 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/
+enabled=1
+gpgcheck=0
+EOF
 
-# upload the opendaylight puppet module
+# OpenDaylight Puppet Module
 rm -rf puppet-opendaylight
-git clone -b opnfv_integration https://github.com/dfarrell07/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
+git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/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
+
+# networking-BGPVPN
+rm -rf networking-bgpvpn
+mkdir networking-bgpvpn
+pushd networking-bgpvpn > /dev/null
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm
+popd > /dev/null
+tar czf networking-bgpvpn.tar.gz networking-bgpvpn/
+
+# install ODL packages
+# install Jolokia for ODL HA
+# Patch in OPNFV custom puppet-tripleO
+# install Honeycomb
+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 ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \
+    --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \
+    --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
+    --install opendaylight,python-networking-odl \
+    --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 ${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 && cd networking-bgpvpn/ && yum localinstall python2-networking-bgpvpn && rm -rf /root/networking-bgpvpn*" \
+    -a overcloud-full-opendaylight_build.qcow2
 
 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
 popd > /dev/null