Merge "Adding tacker support"

diff --cc lib/overcloud-deploy-functions.sh
index 0c3f9d4,b035422..14c3724
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -199,12 -197,12 +199,16 @@@ if [ "$debug" == 'TRUE' ]; the
      LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
  fi
  
+ if [ "${deploy_options_array['tacker']}" == 'True' ]; then
+     sed -i '/EnableTacker/\\c  EnableTacker: true' opnfv-environment.yaml
+ fi
+ 
  source stackrc
  set -o errexit
 +# Workaround for APEX-207 where sometimes swift proxy is down
 +if ! sudo systemctl status openstack-swift-proxy > /dev/null; then
 +  sudo systemctl restart openstack-swift-proxy
 +fi
  echo "Uploading overcloud glance images"
  openstack overcloud image upload
  

diff --cc lib/post-install-functions.sh
Simple merge