summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/overcloud-opendaylight.sh18
-rwxr-xr-xci/deploy.sh11
-rw-r--r--config/deploy/os-odl_l2-nofeature-ha.yaml1
-rw-r--r--lib/python/apex/deploy_env.py2
4 files changed, 27 insertions, 5 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 8d5a2b9..4f8a3ff 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 \
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8d82b42..f9a5f0c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -804,7 +804,7 @@ function undercloud_prep_overcloud_deploy {
fi
# Handle different dataplanes
- if [ "${deploy_options_array['dataplane']}" != 'ovs']; then
+ if [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
echo "${red}ovs is the only currently available dataplane. ${deploy_options_array['dataplane']} not implemented${reset}"
exit 1
fi
@@ -846,6 +846,15 @@ EOI
fi
+ # Set ODL version accordingly
+ if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
+ --run-command "yum -y install /root/boron/*" \
+ -a overcloud-full.qcow2
+EOI
+ fi
+
# Add performance deploy options if they have been set
if [ ! -z "${deploy_options_array['performance']}" ]; then
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index 8292dee..b35da15 100644
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -4,6 +4,7 @@ global_params:
deploy_options:
sdn_controller: opendaylight
sdn_l3: false
+ odl_version: beryllium
tacker: false
congress: false
sfc: false
diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py
index 25e2d0a..fb03cd0 100644
--- a/lib/python/apex/deploy_env.py
+++ b/lib/python/apex/deploy_env.py
@@ -12,6 +12,7 @@ import yaml
import logging
REQ_DEPLOY_SETTINGS = ['sdn_controller',
+ 'odl_version',
'sdn_l3',
'tacker',
'congress',
@@ -67,7 +68,6 @@ class DeploySettings:
"specified. Valid dataplanes:"
" {}".format(value,planes))
-
for req_set in REQ_DEPLOY_SETTINGS:
if req_set not in deploy_options:
if req_set == 'dataplane':