diff options
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 811249b4..c6a53e3d 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -80,6 +80,13 @@ EOF # Get Real Time Kernel from kvm4nfv populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm +# ODL/FDIO packages frozen for L3 scenarios +fdio_l3_pkg_str='' +for package in ${fdio_l3_pkgs[@]}; do + wget "$fdio_l3_uri_base/$package" + fdio_l3_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l3/" +done + # ODL/FDIO packages frozen for L2 scenarios fdio_l2_pkg_str='' for package in ${fdio_l2_pkgs[@]}; do @@ -87,6 +94,13 @@ for package in ${fdio_l2_pkgs[@]}; do fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/" done +# FDIO packages frozen for nosdn scenarios +fdio_nosdn_pkg_str='' +for package in ${fdio_nosdn_pkgs[@]}; do + wget "$fdio_nosdn_uri_base/$package" + fdio_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_nosdn/" +done + # Increase disk size by 900MB to accommodate more packages qemu-img resize overcloud-full_build.qcow2 +900MB @@ -104,19 +118,22 @@ qemu-img resize overcloud-full_build.qcow2 +900MB LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "xfs_growfs /dev/sda" \ --upload ${BUILD_DIR}/opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ + --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ --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-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_l3" \ --run-command "mkdir /root/fdio_l2" \ + --run-command "mkdir /root/fdio_nosdn" \ + --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_nosdn \ + $fdio_l3_pkg_str \ $fdio_l2_pkg_str \ + $fdio_nosdn_pkg_str \ + --run-command "yum install -y /root/fdio_l2/*.rpm" \ --run-command "yum install -y etcd" \ --install python-etcd \ --run-command "puppet module install cristifalcas/etcd" \ @@ -143,6 +160,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install /root/$tacker_pkg \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ + --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ + --run-command "mkdir /root/ovs27" \ + --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ --run-command "pip install python-senlinclient" \ --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \ |