Updating heat cli calls to converged cli

In newton the heat cli is deprecated:

WARNING (shell) "heat stack-list" is deprecated, please use "openstack stack list" instead
WARNING (shell) "heat resource-list" is deprecated, please use "openstack stack resource list" instead

Change-Id: Ia32f05c72500e5fdd525c32a9b41b2be3cb1599c
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 516dac9..4b592b4 100755 (executable)
--- 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 d21b836..604eb70 100755 (executable)
--- 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 bc9a959..bf4128a 100644 (file)
--- 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