openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[NEWTON-ONLY] Ignore Ceph healt warning states by default" into stable/newton

This commit is contained in:
Jenkins 2017-08-14 03:39:47 +00:00 committed by Gerrit Code Review
parent 2e6e54809b 3f1a33666a
commit ec5c1cf604
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extraconfig/tasks/major_upgrade_ceph_mon.sh
View File

@ -23,10 +23,9 @@ if [ ${CEPH_STATUS} = HEALTH_ERR ]; then
exit 1
fi
# Useful when upgrading with OSDs num < replica size
if [[ ${ignore_ceph_upgrade_warnings:-False} != [Tt]rue ]]; then
if [[ ${ignore_ceph_upgrade_warnings:-True} != [Tt]rue ]]; then
timeout 300 bash -c "while [ ${CEPH_STATUS} != HEALTH_OK ]; do
echo WARNING: Waiting for Ceph cluster status to go HEALTH_OK;
echo WARNING: Waiting for Ceph cluster health to be HEALTH_OK;
sleep 30;
CEPH_STATUS=$(ceph health | awk '{print $1}')
done"

2
extraconfig/tasks/major_upgrade_pacemaker.yaml
View File

@ -20,7 +20,7 @@ parameters:
default: 'auto'
IgnoreCephUpgradeWarnings:
type: boolean
default: false
default: true
description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean
KeepSaharaServicesOnUpgrade:
type: boolean