diff options
author | Tim Rozet <trozet@redhat.com> | 2017-08-29 11:23:39 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2017-09-11 16:14:18 -0400 |
commit | 48cd7b87e201ccdaa73ee82fd591ec447961e7aa (patch) | |
tree | 2505ecde3b34f8d49cc8acacf3030d526bfa7d4b /build | |
parent | 23be56d9f0801cbc065accf77a850bcc106c1e84 (diff) |
Updates SFC to use nitrogen
Also fixes issue where openvswitch NSH rpm was not getting installed
because we needed to downgrade now that default OVS is 2.7 and NSH OVS
is 2.6.1
Change-Id: I1b639ca80214032e93aacb3332e9588d49e74127
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rwxr-xr-x | build/overcloud-opendaylight.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 96b43d87..c850005e 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -42,6 +42,8 @@ pushd puppet-opendaylight > /dev/null git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz git checkout master git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz +git checkout stable/nitrogen +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz popd > /dev/null # cache gluon @@ -71,6 +73,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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-opendaylight-nitrogen.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 \ |