From 301db94be90c7ec6930510ea92d9d3a31375cfc6 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Thu, 24 Mar 2016 13:50:33 -0400
Subject: updating to OpenDaylight Beryllium SR1

Brahmaputra match for 673897bcb5a8e1cb7a58941c8b6f7a4c0052c8fe
build scripts have diverged so cannot Cherry-pick

Change-Id: Ia24802fd6eb7ffec9410f3746d50228ba60ad534
JIRA: APEX-123
---
 build/instack.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/instack.sh b/build/instack.sh
index 682d1b26..164c6f79 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -269,14 +269,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 ###############################################
 
 cat > /tmp/opendaylight.repo << EOF
-[opendaylight]
-name=OpenDaylight \$releasever - \$basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/\$basearch/os/
+[opendaylight-41-release]
+name=CentOS CBS OpenDaylight Beryllium SR1 repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-41-release/\$basearch/os/
 enabled=1
 gpgcheck=0
 EOF
 
-odlrpm=opendaylight-4.0.0-1.rc3.1.el7.noarch.rpm
+odlrpm=opendaylight-4.1.0-1.el7.noarch.rpm
 LIBGUESTFS_BACKEND=direct virt-customize --upload ${rdo_images_uri/file:\/\//}/$odlrpm:/tmp/ \
     -a overcloud-full-opendaylight.qcow2
 opendaylight=/tmp/$odlrpm
@@ -292,7 +292,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 
 # upload the opendaylight puppet module
 rm -rf puppet-opendaylight
-cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.2.2.tar.gz puppet-opendaylight.tar.gz
+cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.5.0.tar.gz puppet-opendaylight.tar.gz
 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" \
                                          --upload ../opendaylight-puppet-neutron.patch:/tmp \
-- 
cgit 1.2.3-korg