diff options
| -rw-r--r-- | build/Makefile | 3 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 12 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 2 | ||||
| -rwxr-xr-x | build/undercloud.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 4 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 3 |
7 files changed, 15 insertions, 15 deletions
diff --git a/build/Makefile b/build/Makefile index 0bedd9d6..5dc4ef13 100644 --- a/build/Makefile +++ b/build/Makefile @@ -248,7 +248,7 @@ $(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm ############### .PHONY: overcloud-opendaylight -overcloud-opendaylight: quagga-zrpc $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 +overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 $(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 @echo "Building the Apex OpenDaylight Overcloud Image" @@ -331,7 +331,6 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMCOM) $(BUILD_DIR)/centos/Packages @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages - @ln $(RPMONO) $(BUILD_DIR)/centos/Packages # add packages to the centos packages cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-yaml python34-setuptools ipxe-roms-qemu cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 9103b9ad..59544d7b 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -112,7 +112,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "mkdir /root/dpdk_rpms" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ - --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-api-python vpp-plugins vpp-api-java" \ + --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-lib vpp-api-python vpp-plugins vpp-api-java" \ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "mkdir /root/fdio_l2" \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 4a2173d0..f892c712 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -73,10 +73,8 @@ pushd netready/ > /dev/null git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz popd > /dev/null -# Tar up all quagga/zrpc rpms -pushd ${QUAGGA_RPMS_DIR}/rpmbuild/RPMS > /dev/null -tar --transform "s/^x86_64/quagga/" -czvf ${BUILD_DIR}/quagga.tar.gz x86_64/ -popd > /dev/null +# Download quagga/zrpc rpms +populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga.tar.gz # install ODL packages # Patch in OPNFV custom puppet-tripleO @@ -97,7 +95,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgvpn*.rpm" \ + --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \ --run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \ --run-command "touch /etc/neutron/networking_bgpvpn.conf" \ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \ @@ -106,12 +104,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install python-click \ --upload ${CACHE_DIR}/$gluon_rpm:/root/\ --install /root/$gluon_rpm \ - --upload ${BUILD_DIR}/quagga.tar.gz:/root/ \ + --upload ${CACHE_DIR}/quagga.tar.gz:/root/ \ --run-command "cd /root/ && tar xzf quagga.tar.gz" \ --run-command "yum downgrade -y python-zmq-14.3.1" \ --install zeromq-4.1.4,zeromq-devel-4.1.4 \ --install capnproto-devel,capnproto-libs,capnproto \ -a overcloud-full-opendaylight_build.qcow2 -mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 +LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 popd > /dev/null diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 3f89da1b..6a03be04 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -55,6 +55,7 @@ install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv- install config/deploy/os-odl_l3-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-noha.yaml install config/deploy/os-odl_l3-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-ha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml +install config/deploy/os-odl_l3-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-noha.yaml install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml #install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml #install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml @@ -137,6 +138,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml #%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml #%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml diff --git a/build/undercloud.sh b/build/undercloud.sh index 4e1b963a..424f6f86 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -25,7 +25,7 @@ git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${ popd > /dev/null # inject rt_kvm kernel rpm name into the enable file -sed -i "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml +sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml # installing forked opnfv-tht # enabling ceph OSDs to live on the controller @@ -52,7 +52,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/opnfv-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/first-boot.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/kvm4nfv-1st-boot.yaml:/home/stack/ \ - --upload ${BUILD_ROOT}/enable_rt_kvm.yaml:/home/stack/ \ + --upload ${BUILD_DIR}/enable_rt_kvm.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \ --upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \ --install "python2-congressclient" \ diff --git a/build/variables.sh b/build/variables.sh index be610d43..9322442e 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -56,12 +56,12 @@ netvpp_branch="master" netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm -gluon_rpm=gluon-0.0.1-1_20170216.noarch.rpm +gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm + fdio_l2_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l2_rpms fdio_l2_pkgs=( 'vpp-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-api-python-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -'vpp-devel-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' ) diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 3ffe3b14..36346d85 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -209,8 +209,9 @@ EOI # Override any previous packages if FDIO and ODL L2 if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \ + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ --run-command "yum -y install /root/fdio_l2/*.rpm" \ + --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ -a overcloud-full.qcow2 EOI fi |