diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2017-06-29 18:50:09 +0200 |
|---|---|---|
| committer | Ricardo Noriega <rnoriega@redhat.com> | 2017-07-04 11:07:24 +0000 |
| commit | 8c86c096ab818f70215ffeb54b571ee04880242e (patch) | |
| tree | dfe32b2538c0b1b07b4aad77b72716286e3d5384 | |
| parent | ff9beeb45e7d25aedf2d25644497b0468a96ee16 (diff) | |
Adapting BGPVPN scenario to new composable service
Depends-On: I4af82d456c9d999667f2ef4d16e8f6822463d331
Depends-On: Id28df6ed307976fbb20fa1300f7349b743d96569
Change-Id: I8b6c909ea801491e524206ee4270d453164f3c46
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
| -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 0492491b..33d4dd1f 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 |