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
This commit is contained in:
parent
33afffa972
commit
db75d9fea1
|
@ -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 <<EOF>$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")
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue