diff options
| -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 |