diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-16 15:59:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 15:59:41 +0000 |
| commit | 0658df1604d3f5a7042478104778ba7e9d233a3e (patch) | |
| tree | 9a1c66104163337bfd9959984308e7e695d76609 /lib | |
| parent | f7d9228f84649ace479e34e81b17248593fdad95 (diff) | |
| parent | 66386e48403de6c04902ee01cf38c402be02c05e (diff) | |
Merge "Adding tacker support back into Danube"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 9 |
1 files changed, 4 insertions, 5 deletions
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 "" |