diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-09 06:39:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-09 06:39:11 +0000 |
| commit | 0f3249df2b68ff426a6aff6ccd8981747e234586 (patch) | |
| tree | 52ef1fc0130241ffce5b1dde9f5acc24d7cd9c71 /extraconfig/tasks/major_upgrade_pacemaker.yaml | |
| parent | bedf3dc546982624628267f812bae24d9b73ff44 (diff) | |
| parent | 4ea34edb793ab4bd3d9d5198ea9ac7568930c384 (diff) | |
Merge "Add Ceph cluster health validation on upgrade"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_pacemaker.yaml')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker.yaml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml index c2e14880..598d22d0 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml @@ -26,6 +26,10 @@ parameters: constraints: - allowed_values: ['auto', 'yes', 'no'] default: 'auto' + IgnoreCephUpgradeWarnings: + type: boolean + default: false + description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean resources: # TODO(jistr): for Mitaka->Newton upgrades and further we can use @@ -36,7 +40,16 @@ resources: type: OS::Heat::SoftwareConfig properties: group: script - config: {get_file: major_upgrade_ceph_mon.sh} + config: + list_join: + - '' + - - str_replace: + template: | + #!/bin/bash + ignore_ceph_upgrade_warnings='IGNORE_CEPH_UPGRADE_WARNINGS' + params: + IGNORE_CEPH_UPGRADE_WARNINGS: {get_param: IgnoreCephUpgradeWarnings} + - get_file: major_upgrade_ceph_mon.sh CephMonUpgradeDeployment: type: OS::Heat::SoftwareDeploymentGroup |