diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-27 08:50:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-27 08:50:49 +0000 |
| commit | a7b7a118bf511ec2221f9bf2f9a42fd746edead0 (patch) | |
| tree | 714f31b0886e2b641dcf6cb1b17270449fb0a743 | |
| parent | 38bc3e782affc09549ebb22a3e8eed3549397f28 (diff) | |
| parent | 16aba8f2b6cd0638cb1ab44b8923eff52de2ae20 (diff) | |
Merge "Remove deprecated scheduler_driver settings"
| -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 65dd2ab7..cdf3fa70 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -178,5 +178,7 @@ crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit 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 +# LP: 1627450, required only for M/N upgrade +crudini --set /etc/nova/nova.conf DEFAULT scheduler_driver filter_scheduler crudini --set /etc/sahara/sahara.conf DEFAULT plugins ambari,cdh,mapr,vanilla,spark,storm |