diff options
-rw-r--r-- | ci/PR_revision.log | 3 | ||||
-rwxr-xr-x | lib/overcloud-deploy-functions.sh | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index fa978dfe..5edb97e0 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -18,4 +18,5 @@ 44,Fixes nova host/ip bug 43,Add support for live migration and resize 41,Add pcs cleanup exec -50,Fix rabbitmq ipv6 config
\ No newline at end of file +50,Fix rabbitmq ipv6 config +52,Add notifier topic to ceilometer diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index e613dae0..2d352321 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -105,6 +105,10 @@ EOI exit 1 fi + if [ "$debug" == 'TRUE' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex" + fi + # Set ODL version accordingly if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI @@ -208,10 +212,6 @@ EOI echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -if [ "$debug" == 'TRUE' ]; then - LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex -fi - if [ "${deploy_options_array['tacker']}" == 'False' ]; then sed -i '/EnableTacker:/c\ EnableTacker: false' opnfv-environment.yaml fi |