diff options
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 10 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/build/Makefile b/build/Makefile index 05e4cd40..43eae37a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -279,7 +279,7 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages # add packages to the centos packages - cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe python2-virtualbmc python-pbr python-prettytable python-pyghmi python-crypto + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe python2-virtualbmc python-pbr python-prettytable python-pyghmi python-crypto libvirt-python cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm # regenerate yum repo data @echo "Generating new yum metadata" 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 |