openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Fix deprecation warnings"

This commit is contained in:
Zuul 2018-03-08 11:35:51 +00:00 committed by Gerrit Code Review
parent 0270f9f06c db75d9fea1
commit d2294518b5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/tripleo.sh
View File

@ -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")

4
scripts/wait_for
View File

@ -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
}