Upgrades DPDK/OVS-DPDK RPMs

[apex.git] / build / overcloud-full.sh

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 1a8d846..171731f 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -18,6 +18,11 @@ if [ ! -d images/ ]; then mkdir images; fi
 tar -xf cache/overcloud-full.tar -C images/
 mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
 
+# Add extra space to the overcloud image
+qemu-img resize images/overcloud-full_build.qcow2 +1G
+LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \
+                                         --run-command 'resize2fs /dev/sda'
+
 ##########################################################
 #####  Prep initial overcloud image with common deps #####
 ##########################################################
@@ -29,7 +34,8 @@ git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar
 popd > /dev/null
 
 # download customized os-net-config
-git clone https://github.com/trozet/os-net-config.git -b hiera_nic_mapping
+rm -fr os-net-config
+git clone https://github.com/trozet/os-net-config.git -b stable/colorado
 pushd os-net-config > /dev/null
 pushd os_net_config > /dev/null
 git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz
@@ -49,6 +55,8 @@ done
 # upload dpdk rpms but do not install
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
+    --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 "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --run-command "mkdir /root/dpdk_rpms" \