openstack/ironic
Code Issues Proposed changes

Merge "Fix start order for Ironic during upgrade"

Browse Source
This commit is contained in:
Jenkins 2016-05-19 12:28:18 +00:00 committed by Gerrit Code Review
commit bb42652d70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/upgrade/upgrade.sh
View File

@ -101,11 +101,11 @@ fi
$IRONIC_BIN_DIR/ironic-dbsync --config-file=$IRONIC_CONF_FILE $IRONIC_BIN_DIR/ironic-dbsync --config-file=$IRONIC_CONF_FILE
start_ironic
# calls upgrade-ironic for specific release # calls upgrade-ironic for specific release
upgrade_project ironic $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH upgrade_project ironic $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
start_ironic
# Don't succeed unless the services come up # Don't succeed unless the services come up
ensure_services_started ironic-api ironic-conductor ensure_services_started ironic-api ironic-conductor
ensure_logs_exist ir-cond ir-api ensure_logs_exist ir-cond ir-api