diff options
| author |   Michael Chapman <michapma@redhat.com> | 2017-07-06 16:12:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-06 16:12:28 +0000 |
| commit | 85d68ef3be89293b9dd9525d05f6de0b06d9fab3 (patch) | |
| tree | 9348ee69ee2618f1977b33513e8cf3b11f0b3636 | |
| parent | 7a9ed3bf2eedde64826eefd900c597f4fa65e521 (diff) | |
| parent | 8c86c096ab818f70215ffeb54b571ee04880242e (diff) | |
Merge "Adapting BGPVPN scenario to new composable service"
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 10 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 91652008..12b47f1e 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -36,16 +36,6 @@ 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 -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm -populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm -pushd ${CACHE_DIR}/ > /dev/null -tar czf ${BUILD_DIR}/networking-bgpvpn.tar.gz *networking-bgpvpn* -popd > /dev/null - # cache gluon populate_cache http://artifacts.opnfv.org/netready/$gluon_rpm diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index d886abee..d2ae027a 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -29,7 +29,7 @@ function overcloud_deploy { if [ "${deploy_options_array['sfc']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" elif [ "${deploy_options_array['vpn']}" == 'True' ]; then - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-bgpvpn.yaml" + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-bgpvpn-opendaylight.yaml" if [ "${deploy_options_array['gluon']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/gluon.yaml" fi |