summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-09 17:24:28 -0400
committerDan Radez <dradez@redhat.com>2016-06-10 00:05:43 +0000
commit88e800cde8e61acb05b60bff5997cb843ec6e133 (patch)
tree64fd40fae799dd7ba2473dd5de41c867054002ad /build
parentb9947ec813fea9c71b7c3208df36d110eca90b55 (diff)
Parameterizes ODL version to deploy options
Changes include: - Minor syntax fix to dataplane check - Adds 'odl_version' to deploy options - Builds ODL overcloud image with boron rpm included - If user specifies 'boron' as odl_version then, package is upgraded on overcloud image Change-Id: I37436cb8cc4d6cff1fede6c13836f26a4cc57f49 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-opendaylight.sh18
1 files changed, 15 insertions, 3 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 8d5a2b9f..4f8a3ff0 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -18,10 +18,20 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
##### Adding OpenDaylight to overcloud #####
###############################################
+# Beryllium Repo
cat > /tmp/opendaylight.repo << EOF
-[opendaylight-41-release]
-name=CentOS CBS OpenDaylight Beryllium SR1 repository
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-41-release/\$basearch/os/
+[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
+
+# 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/
enabled=1
gpgcheck=0
EOF
@@ -30,6 +40,8 @@ EOF
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
LIBGUESTFS_BACKEND=direct virt-customize \
+ --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
+ --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
--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 \