diff options
| -rw-r--r-- | build/Makefile | 11 | ||||
| -rwxr-xr-x | lib/configure-deps-functions.sh | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index 2ff7c8eb..226bc09f 100644 --- a/build/Makefile +++ b/build/Makefile @@ -59,6 +59,9 @@ $(RPMCOM): .PHONY: common-rpm-clean common-rpm-clean: + rm -rf opnfv-apex-common-$(RPMVERS) + rm -rf opnfv-apex-common.tar.gz + ################## # PYTHON TESTS # @@ -204,7 +207,6 @@ networking-vpp.noarch.rpm: networking-vpp networking-vpp: git clone https://git.openstack.org/openstack/networking-vpp - pushd networking-vpp && git reset --hard 343e8584e445e3dfc10975041d78df8abee1796d ############### # UNDERCLOUD # @@ -243,6 +245,9 @@ $(RPMUDR): .PHONY: undercloud-rpm-clean undercloud-rpm-clean: + rm -rf opnfv-apex-undercloud-$(RPMVERS) + rm -rf opnfv-apex-undercloud.tar.gz + ############### # OVERCLOUD # @@ -296,6 +301,9 @@ $(RPMODL): .PHONY: opendaylight-rpm-clean opendaylight-rpm-clean: + rm -rf opnfv-apex-$(RPMVERS) + rm -rf opnfv-apex.tar.gz + ############### # ONOS # @@ -317,6 +325,7 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2 .PHONY: onos-rpm-clean onos-rpm-clean: @#rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')" + rm -rf opnfv-apex-onos-$(RPMVERS) rm -rf opnfv-apex-onos.tar.gz opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2 diff --git a/lib/configure-deps-functions.sh b/lib/configure-deps-functions.sh index 1d238f87..b9799969 100755 --- a/lib/configure-deps-functions.sh +++ b/lib/configure-deps-functions.sh @@ -75,7 +75,7 @@ EOF if [[ "$network" != "admin" && "$network" != "external" ]]; then continue fi - this_interface=$(eval echo \${${network}_bridged_interface}) + this_interface=$(eval echo \${${network}_installer_vm_members}) # check if this a bridged interface for this network if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then if ! attach_interface_to_ovs ${NET_MAP[$network]} ${this_interface} ${network}; then |