Merge "Adds overcloud ssh support and other fixes"

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

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 5e11b77..936decc 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -10,54 +10,77 @@
 set -e
 source ./cache.sh
 source ./variables.sh
+source ./functions.sh
 
 populate_cache "$rdo_images_uri/overcloud-full.tar"
+populate_cache "$openstack_congress"
 
 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 #####
 ##########################################################
 
-pushd images > /dev/null
-# Update puppet-aodh it's old
-rm -rf aodh
-git clone https://github.com/openstack/puppet-aodh aodh
-pushd aodh > /dev/null
-git checkout stable/liberty
+# prep opnfv-puppet-tripleo for undercloud
+clone_fork opnfv-puppet-tripleo
+pushd opnfv-puppet-tripleo > /dev/null
+git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar.gz
+popd > /dev/null
+
+# download customized os-net-config
+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
 popd > /dev/null
-tar -czf puppet-aodh.tar.gz aodh
+popd > /dev/null
+
+pushd images > /dev/null
 
-# grab latest puppet-neutron module
-rm -rf puppet-neutron
-git clone -b stable/liberty https://github.com/openstack/puppet-neutron.git
-pushd puppet-neutron
-git archive --format=tar.gz --prefix=neutron/ HEAD > ../puppet-neutron.tar.gz
-popd
+dpdk_pkg_str=''
+for package in ${dpdk_rpms[@]}; do
+  curl -O "$dpdk_uri_base/$package"
+  dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
+done
 
+# tar up the congress puppet module
+rm -rf puppet-congress
+git clone https://github.com/radez/puppet-congress
+pushd puppet-congress > /dev/null
+git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz
+popd > /dev/null
 
-# Add epel to install ceph
-# update aodh
-# puppet-neutron-force-metadata.patch
-# puppet-cinder-quota-fix
-#aodh-puppet-tripleo
-AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer"
-AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier"
+# installing forked opnfv-puppet-tripleo
+# enable connection tracking for protocal sctp
+# upload dpdk rpms but do not install
+# enable connection tracking for protocal sctp
+# install the congress rpms
+# upload and explode the congress puppet module
 LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \
+    --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" \
-    --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
-    --install "$AODH_PKG,ceph" \
-    --run-command "rm -rf /etc/puppet/modules/neutron" \
-    --upload puppet-neutron.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && tar xzf puppet-neutron.tar.gz" \
-    --upload ../puppet-cinder-quota-fix.patch:/tmp \
-    --run-command "cd /etc/puppet/modules/cinder && patch -Np1 < /tmp/puppet-cinder-quota-fix.patch" \
-    --upload ../aodh-puppet-tripleo.patch:/tmp \
-    --run-command "cd /etc/puppet/modules/tripleo && patch -Np1 < /tmp/aodh-puppet-tripleo.patch" \
+    --run-command "mkdir /root/dpdk_rpms" \
+    $dpdk_pkg_str \
+    --install "centos-release-qemu-ev" \
+    --run-command "yum update -y" \
+    --run-command "yum remove -y qemu-system-x86" \
+    --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
+    --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
+    --install "$openstack_congress" \
+    --install "python2-congressclient" \
+    --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
+    --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2