summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-26 22:12:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-26 22:12:04 +0000
commitadf74f577852779302ed77b1d45584af9830c1e2 (patch)
tree129bb7d488826c78c4f6cc9c095dcdcd65717e47
parent05ab832380db398a79bbc9b7bc28993175178346 (diff)
parent0a78a0e5da0e9db70188340d7d3ffa283bfe7b6b (diff)
Merge "Update puppet-opendaylight git repo url" into stable/danube
-rwxr-xr-xbuild/overcloud-opendaylight.sh11
-rwxr-xr-xlib/overcloud-deploy-functions.sh9
2 files changed, 16 insertions, 4 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 1efd209..6713118 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -48,9 +48,11 @@ EOF
# OpenDaylight Puppet Module
rm -rf puppet-opendaylight
-git clone -b master https://github.com/dfarrell07/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.tar.gz
+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
popd > /dev/null
# cache networking-BGPVPN
@@ -93,8 +95,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "wget ${honeycomb_pkg} -O /root/fdio/${honeycomb_pkg##*/}" \
--install opendaylight,python-networking-odl \
--run-command "yum install -y /root/fdio/${honeycomb_pkg##*/}" \
- --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}/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}/networking-bgpvpn.tar.gz:/root/ \
--run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \
--run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 990a05f..0ed91ef 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -271,6 +271,15 @@ EOI
--run-command "yum -y install /root/${odl_version}/*" \
-a overcloud-full.qcow2
EOI
+
+ # 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 if we enable netvirt for fdio