From db75d9fea1a52f2a13a27b3d55c870aaba592169 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Wed, 21 Feb 2018 10:06:54 +0100 Subject: [PATCH] Fix deprecation warnings As a technical debt this change replaces "heat stack-show" with "openstack stack show" as well as "heat stack-delete" with "openstack stack delete" to remove deprecation warnings such as 'WARNING (shell) "heat stack-show" is deprecated, please use "openstack stack show"' Change-Id: I7bcc18445f3263128a9bff29a057f172af143c90 --- scripts/tripleo.sh | 10 +++++----- scripts/wait_for | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index adf9b2e7f..83a8ad082 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -850,7 +850,7 @@ function overcloud_update { function overcloud_upgrade { stackrc_check - if heat stack-show "$OVERCLOUD_NAME" 2>&1 > /dev/null ; then + if openstack stack show "$OVERCLOUD_NAME" 2>&1 > /dev/null ; then log "Create overcloud repo template file" /bin/bash -c "cat <$HOME/init-repo.yaml @@ -887,7 +887,7 @@ EOF" openstack overcloud deploy $OVERCLOUD_UPGRADE_ARGS log "Major upgrade - DONE." - if heat stack-show "$OVERCLOUD_NAME" | grep "stack_status " | egrep "UPDATE_COMPLETE"; then + if openstack stack show "$OVERCLOUD_NAME" | grep "stack_status " | egrep "UPDATE_COMPLETE"; then log "Major Upgrade - DONE." else log "Major Upgrade FAILED." @@ -901,14 +901,14 @@ EOF" function overcloud_upgrade_converge { stackrc_check - if heat stack-show "$OVERCLOUD_NAME" 2>&1 > /dev/null; then + if openstack stack show "$OVERCLOUD_NAME" 2>&1 > /dev/null; then log "Overcloud upgrade converge started." log "Upgrade command arguments: $OVERCLOUD_UPGRADE_CONVERGE_ARGS" log "Execute major upgrade converge." openstack overcloud deploy $OVERCLOUD_UPGRADE_CONVERGE_ARGS log "Major upgrade converge - DONE." - if heat stack-show "$OVERCLOUD_NAME" | grep "stack_status " | egrep "UPDATE_COMPLETE"; then + if openstack stack show "$OVERCLOUD_NAME" | grep "stack_status " | egrep "UPDATE_COMPLETE"; then log "Major Upgrade converge - DONE." else log "Major Upgrade converge FAILED." @@ -1064,7 +1064,7 @@ function overcloud_sanitytest { exitval=0 stackrc_check - if heat stack-show "$OVERCLOUD_NAME" | grep "stack_status " | egrep -q "(CREATE|UPDATE)_COMPLETE"; then + if openstack stack show "$OVERCLOUD_NAME" | grep "stack_status " | egrep -q "(CREATE|UPDATE)_COMPLETE"; then ENABLED_SERVICES=$(openstack stack output show overcloud EnabledServices -f json | \ jq -r ".output_value" | jq '.Controller | .[]' | tr "\n" " " | sed "s/\"//g") diff --git a/scripts/wait_for b/scripts/wait_for index 0e151275b..779427ffa 100755 --- a/scripts/wait_for +++ b/scripts/wait_for @@ -44,8 +44,8 @@ function show_options { echo " wait_for -w 300 --delay 10 -- ping -c 1 192.0.2.2" echo " wait_for -w 10 --delay 1 -- ls file_we_are_waiting_for" echo " wait_for -w 30 --delay 3 -- date \| grep 8" - echo " wait_for -w 300 --delay 10 --fail-match CREATE_FAILED -- heat stack-show undercloud" - echo " wait_for -w 300 --delay 10 --success-match CREATE_COMPLETE -- heat stack-show undercloud" + echo " wait_for -w 300 --delay 10 --fail-match CREATE_FAILED -- openstack stack show undercloud" + echo " wait_for -w 300 --delay 10 --success-match CREATE_COMPLETE -- openstack stack show undercloud" exit $EXITVAL }