diff options
| -rw-r--r-- | build/Makefile | 11 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 19 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 5 | ||||
| -rw-r--r-- | build/variables.sh | 9 | ||||
| -rwxr-xr-x | lib/configure-deps-functions.sh | 2 |
5 files changed, 23 insertions, 23 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/build/overcloud-full.sh b/build/overcloud-full.sh index 148b0f0a..95a7b04e 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -45,12 +45,6 @@ for package in ${dpdk_rpms[@]}; do dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" done -fdio_pkg_str='' -for package in ${fdio_pkgs[@]}; do - wget "$fdio_uri_base/$package" - fdio_pkg_str+=" --upload $package:/root/fdio" -done - # tar up the congress puppet module rm -rf puppet-congress git clone -b stable/mitaka https://github.com/radez/puppet-congress @@ -87,6 +81,15 @@ pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz popd > /dev/null +# Master FD.IO Repo +cat > /tmp/fdio.repo << EOF +[fdio-master] +name=fd.io master branch latest merge +baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/ +enabled=1 +gpgcheck=0 +EOF + # installing forked opnfv-puppet-tripleo # enable connection tracking for protocal sctp # upload dpdk rpms but do not install @@ -107,9 +110,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ --run-command "mkdir /root/dpdk_rpms" \ - --run-command "mkdir /root/fdio" \ + --upload /tmp/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ - $fdio_pkg_str \ + --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \ --upload ../networking-vpp.noarch.rpm:/root/fdio \ --run-command "pip install distro flask_restful" \ --run-command "yum install -y etcd" \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index a91d55e1..c7ed8c71 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -46,8 +46,6 @@ EOF # SDNVPN - Copy tunnel setup script wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py -# Honeycomb RPM -wget $fdio_uri_base/$honeycomb_pkg # install ODL packages # install Jolokia for ODL HA @@ -62,8 +60,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ --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" \ - --upload $honeycomb_pkg:/root/ \ - --run-command "yum -y install /root/$honeycomb_pkg" \ + --install honeycomb \ --upload ./setup_TEPs.py:/tmp \ -a overcloud-full-opendaylight_build.qcow2 diff --git a/build/variables.sh b/build/variables.sh index c4ac16c8..c307c84c 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -27,12 +27,3 @@ dpdk_rpms=( 'ovs4opnfv-e8acab14-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm' 'ovs4opnfv-e8acab14-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) - -fdio_uri_base=http://artifacts.opnfv.org/apex/colorado -fdio_pkgs=( -'vpp-16.09-release.x86_64.rpm' -'vpp-devel-16.09-release.x86_64.rpm' -'vpp-lib-16.09-release.x86_64.rpm' -'vpp-python-api-16.09-release.x86_64.rpm' -) -honeycomb_pkg='honeycomb-1.16.9-FINAL.noarch.rpm' 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 |