diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-29 11:41:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-29 11:41:19 +0000 |
| commit | dfa0b12265c573314092eb8479caca76322a9f06 (patch) | |
| tree | e47dc585d87ff8d88735c9008ccddebff252b57e | |
| parent | 23f1508062ec61cddfd15d8cdeabc733902d6aad (diff) | |
| parent | 6e56f873148784ff34babf62a8ccc718e7d789d3 (diff) | |
Merge "Set UpdateIdentifier for upgrade converge, to prevent services down"
| -rw-r--r-- | environments/major-upgrade-pacemaker-converge.yaml | 4 | ||||
| -rwxr-xr-x | extraconfig/tasks/pacemaker_resource_restart.sh | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml index f023cb32..dfcb9654 100644 --- a/environments/major-upgrade-pacemaker-converge.yaml +++ b/environments/major-upgrade-pacemaker-converge.yaml @@ -1,2 +1,6 @@ parameter_defaults: + UpdateIdentifier: 'true' UpgradeLevelNovaCompute: '' + +resource_registry: + OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh index 09a452e6..b2bdc55a 100755 --- a/extraconfig/tasks/pacemaker_resource_restart.sh +++ b/extraconfig/tasks/pacemaker_resource_restart.sh @@ -36,9 +36,3 @@ if [ "$pacemaker_status" = "active" -a \ check_resource httpd started 800 fi - -if [ "$pacemaker_status" = "active" ]; then - # TODO(marios): remove this once +bug/1561012 - # need this on all controllers: - systemctl reload haproxy -fi |