From: Tim Rozet <trozet@redhat.com>
Date: Fri, 22 Jul 2016 02:41:29 +0000 (+0000)
Subject: Merge "Adding tacker support"
X-Git-Tag: colorado.1.0~109
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=66f4a30987f870d5a6416b2c46c7dfb95130b4d9;p=apex.git

Merge "Adding tacker support"
---

66f4a30987f870d5a6416b2c46c7dfb95130b4d9
diff --cc lib/overcloud-deploy-functions.sh
index 0c3f9d44,b0354227..14c37247
--- a/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