summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/overcloud-opendaylight.sh21
-rw-r--r--docs/release/release-notes/release-notes.rst2
-rwxr-xr-xlib/overcloud-deploy-functions.sh15
3 files changed, 22 insertions, 16 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index ae5764c2..775fcbfb 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -27,13 +27,21 @@ enabled=1
gpgcheck=0
EOF
+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
+
# 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 stable/boron
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz
+git checkout master
+git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz
popd > /dev/null
# cache gluon
@@ -55,11 +63,14 @@ populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-
# 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_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 ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz:/etc/puppet/modules/ \
- --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-boron.tar.gz" \
- --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/root/ \
+ --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-gluon.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \
--install python-click \
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 5a292e3c..753ef818 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -104,7 +104,7 @@ deployment toolchain. It is based on following upstream versions:
- OpenStack (Newton release)
-- OpenDaylight (Boron/Carbon releases)
+- OpenDaylight (Carbon/Nitrogen(master) releases)
- CentOS 7
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 0fe838d0..9c9ea188 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -281,7 +281,9 @@ EOI
case "${deploy_options_array['odl_version']}" in
carbon) odl_version=''
;;
- *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon'.${reset}"
+ nitrogen) odl_version='nitrogen'
+ ;;
+ *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'nitrogen'.${reset}"
exit 1
;;
esac
@@ -290,18 +292,11 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
--run-command "yum -y install /root/${odl_version}/*" \
+ --run-command "rm -rf /etc/puppet/modules/opendaylight" \
+ --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-master.tar.gz" \
-a overcloud-full.qcow2
EOI
fi
-
- # Overwrite puppet-opendaylight with carbon. By default we install boron branch.
- if [ "${deploy_options_array['odl_version']}" == 'carbon' ]; then
- ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
- LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /etc/puppet/modules/opendaylight" \
- --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-carbon.tar.gz" \
- -a overcloud-full.qcow2
-EOI
- fi
fi
# Override ODL for fdio scenarios