From 66386e48403de6c04902ee01cf38c402be02c05e Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Wed, 25 Jan 2017 10:14:50 -0500
Subject: Adding tacker support back into Danube
opnfv-tht-pr: 98
opnfv-puppet-tripleo-pr: 11
Change-Id: I971bb2c94eb9500c81b25adf5019fd02f8e90053
Signed-off-by: Dan Radez <dradez@redhat.com>
---
lib/overcloud-deploy-functions.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'lib')
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 77778e78..3d718f54 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -53,7 +53,10 @@ function overcloud_deploy {
exit 1
fi
-
+ # Enable Tacker
+ if [ "${deploy_options_array['tacker']}" == 'True' ]; then
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable_tacker.yaml"
+ fi
# Make sure the correct overcloud image is available
if [ ! -f $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then
@@ -256,10 +259,6 @@ EOI
echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-if [ "${deploy_options_array['tacker']}" == 'False' ]; then
- sed -i '/EnableTacker:/c\ EnableTacker: false' ${ENV_FILE}
-fi
-
# Create a key for use by nova for live migration
echo "Creating nova SSH key for nova resize support"
ssh-keygen -f nova_id_rsa -b 1024 -P ""
--
cgit