diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-29 09:36:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-29 09:36:18 +0000 |
| commit | 5af569abb6922efbb6fee8198d8cd7cc741e1499 (patch) | |
| tree | 6862067fcf790e0c344981d212708106133781d6 /extraconfig | |
| parent | 649a24d1e41e3b33517e844fed794027a271a963 (diff) | |
| parent | 1e8d7f9b0072b8e713f23496f02d1f82f2cc7d1f (diff) | |
Merge "M/N upgrade set scheduler_host_manager right."
Diffstat (limited to 'extraconfig')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index d67d5a1a..2ee473ce 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -199,3 +199,5 @@ crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit # https://bugzilla.redhat.com/show_bug.cgi?id=1284058 # Ifd1861e3df46fad0e44ff9b5cbd58711bbc87c97 Swift Ceilometer middleware no longer exists crudini --set /etc/swift/proxy-server.conf pipeline:main pipeline "catch_errors healthcheck cache ratelimit tempurl formpost authtoken keystone staticweb proxy-logging proxy-server" +# LP: 1615035, required only for M/N upgrade. +crudini --set /etc/nova/nova.conf DEFAULT scheduler_host_manager host_manager |