diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-08 14:29:56 -0400 |
|---|---|---|
| committer |   Feng Pan <fpan@redhat.com> | 2017-08-14 19:31:25 +0000 |
| commit | 7d9495aec0340d743bf0e59db5b7360bef013004 (patch) | |
| tree | 281c5558950ba976354f80417c8fe66bcc6245c4 /build | |
| parent | cf46710061125a4959c8997ee38ca8959c5d2634 (diff) | |
Fixes OpenDaylight version
The default version is now Carbon with the option of using
nitrogen (master) for puppet-odl and opendaylight.
JIRA: APEX-500
Change-Id: I44d02ec0db5fb8e6342e5ab6802a5a3f302b8511
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 21 |
1 files changed, 16 insertions, 5 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 \ |