diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-11-15 16:47:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-15 16:47:02 +0000 |
| commit | 28861bb2ac641b282ec2fc7648fd52a076f821b8 (patch) | |
| tree | 039407014bfbe225e31a822ade438015eada85bb /lib | |
| parent | afc1acf59a2b68c56f87e16ce39104e4aa9647f5 (diff) | |
| parent | 1041cbfc25fa59f12e00cf4480edf4fd742a4715 (diff) | |
Merge "Updating heat cli calls to converged cli"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 2 | ||||
| -rw-r--r-- | lib/utility-functions.sh | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 516dac97..4b592b46 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -319,7 +319,7 @@ EOI ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source stackrc openstack overcloud deploy --templates $DEPLOY_OPTIONS --timeout 90 -if ! heat stack-list | grep CREATE_COMPLETE 1>/dev/null; then +if ! openstack stack list | grep CREATE_COMPLETE 1>/dev/null; then $(typeset -f debug_stack) debug_stack exit 1 diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index d21b8366..604eb70d 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -208,7 +208,7 @@ done # Print out the undercloud IP and dashboard URL source stackrc echo "Undercloud IP: $UNDERCLOUD, please connect by doing 'opnfv-util undercloud'" -echo "Overcloud dashboard available at http://\$(heat output-show overcloud PublicVip | sed 's/"//g')/dashboard" +echo "Overcloud dashboard available at http://\$(openstack stack output show overcloud PublicVip | sed 's/"//g')/dashboard" EOI if [[ "$ha_enabled" == 'True' ]]; then diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh index bc9a9592..bf4128a0 100644 --- a/lib/utility-functions.sh +++ b/lib/utility-functions.sh @@ -88,14 +88,14 @@ function debug_stack { source ~/stackrc IFS=$'\n' - for resource in $(heat resource-list -n 5 overcloud | grep FAILED); do + for resource in $(openstack stack resource list -n 5 overcloud | grep FAILED); do unset IFS resource_arr=(${resource//|/ }) - phys_id=$(heat resource-show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null) + phys_id=$(openstack stack resource show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null) if [ -n "$phys_id" ]; then phys_id_arr=(${phys_id//|/ }) failure_output+="******************************************************" - failure_output+="\n${resource}:\n\n$(heat deployment-show ${phys_id_arr[-1]} 2> /dev/null)" + failure_output+="\n${resource}:\n\n$(openstack stack deployment show ${phys_id_arr[-1]} 2> /dev/null)" failure_output+="\n******************************************************" fi unset phys_id |