Merge "Add python-redis to overcloud"

diff --combined build/overcloud-full.sh
index e995472,c40a843..6143b28
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -58,22 -58,6 +58,22 @@@ pushd puppet-congress > /dev/nul
  git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz
  popd > /dev/null
  
 +# create fd.io yum repo file
 +cat > /tmp/fdio-master.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
 +
 +# tar up the fd.io module
 +rm -rf puppet-fdio
 +git clone https://github.com/radez/puppet-fdio
 +pushd puppet-fdio > /dev/null
 +git archive --format=tar.gz --prefix=fdio/ HEAD > ../puppet-fdio.tar.gz
 +popd > /dev/null
 +
  # installing forked opnfv-puppet-tripleo
  # enable connection tracking for protocal sctp
  # upload dpdk rpms but do not install
@@@ -81,10 -65,9 +81,11 @@@
  # install the congress rpms
  # upload and explode the congress puppet module
  # install doctor driver ## Can be removed in Newton
 +# install fd.io yum repo and packages
 +# upload puppet fdio
  LIBGUESTFS_BACKEND=direct virt-customize \
      --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
+     --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" \
@@@ -102,10 -85,6 +103,10 @@@
      --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
      --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
      --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
 +    --upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \
 +    --install unzip,vpp,honeycomb \
 +    --upload puppet-fdio.tar.gz:/etc/puppet/modules \
 +    --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
      -a overcloud-full_build.qcow2
  
  mv -f overcloud-full_build.qcow2 overcloud-full.qcow2