diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-29 14:56:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-29 14:56:49 +0000 |
| commit | 72aa430246e07877ac37e4b35c3b509197414e49 (patch) | |
| tree | c3a5b1151bb9cb21ff7cb60dc63afadfa39552f2 | |
| parent | 6fadcce8682bd37eb9698ac0b6bac0087fde7955 (diff) | |
| parent | 32c54304f489405ea2e3ab67f5de236ab6f2e5ec (diff) | |
Merge "Relax pre-upgrade check for failed actions"
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_check.sh | 4 | ||||
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extraconfig/tasks/major_upgrade_check.sh b/extraconfig/tasks/major_upgrade_check.sh index dc7ec71a..b65f6915 100755 --- a/extraconfig/tasks/major_upgrade_check.sh +++ b/extraconfig/tasks/major_upgrade_check.sh @@ -88,8 +88,8 @@ check_python_rpm() check_clean_cluster() { - if crm_mon -1 | grep -A3 Failed; then - echo_error "ERROR: upgrade cannot start with failed resources on the cluster. Clean them up before starting: pcs resource cleanup." + if pcs status | grep -q Stopped:; then + echo_error "ERROR: upgrade cannot start with stopped resources on the cluster. Make sure that all the resources are up and running." exit 1 fi } diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index cdf3fa70..d4200e5f 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -6,7 +6,9 @@ cluster_sync_timeout=1800 check_cluster check_pcsd -check_clean_cluster +if [[ -n $(is_bootstrap_node) ]]; then + check_clean_cluster +fi check_python_rpm check_galera_root_password check_disk_for_mysql_dump |