diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-01-27 10:39:37 -0500 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-02-06 21:52:10 +0000 |
| commit | 9771e70ec0fb7fce0242f361db9ba2854d50cee6 (patch) | |
| tree | 8209278fda77e4929ce1255e2d825487fd89193c /build | |
| parent | b8cad752ff9e3685c3b6490e7a4ef3a6862e3767 (diff) | |
Adding networking-bgpvpn; use new neutron-opendaylight-bgpvpn.yaml
opnfv-tht-pr: 100
Change-Id: I5db74e9ec74d6d03fde1650739d934ddfeec45ec
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 0b002111..09319689 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -52,17 +52,6 @@ enabled=1 gpgcheck=0 EOF -#BGPVPN Repo -cat > ${BUILD_DIR}/bgpvpn.repo << EOF -[bgpvpn] -name=bgpvpn -baseurl=https://trunk.rdoproject.org/centos7/consistent/ -includepkgs=python2-networking-bgpvpn -enabled=1 -gpgcheck=0 -priority=1 -EOF - # OpenDaylight Puppet Module rm -rf puppet-opendaylight git clone -b master https://github.com/dfarrell07/puppet-opendaylight @@ -70,6 +59,18 @@ pushd puppet-opendaylight > /dev/null git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight.tar.gz popd > /dev/null +# networking-BGPVPN +rm -rf networking-bgpvpn +mkdir networking-bgpvpn +pushd networking-bgpvpn > /dev/null +wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm +wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm +wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm +wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm +wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm +popd > /dev/null +tar czf networking-bgpvpn.tar.gz networking-bgpvpn/ + # install ODL packages # install Jolokia for ODL HA # Patch in OPNFV custom puppet-tripleO @@ -82,13 +83,13 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \ --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ --install opendaylight,python-networking-odl \ - --upload ${BUILD_DIR}/bgpvpn.repo:/etc/yum.repos.d/bgpvpn.repo \ - --install python-networking-bgpvpn \ --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \ --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \ --install honeycomb \ --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}/networking-bgpvpn.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall python2-networking-bgpvpn && rm -rf /root/networking-bgpvpn*" \ -a overcloud-full-opendaylight_build.qcow2 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 |