diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-15 17:52:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-15 17:52:13 +0000 |
| commit | 0963c2255a9718419c1cf8deaff350ea6ddc8472 (patch) | |
| tree | 20b2efcb8ca3c0a40b9248ce6f29722133e3ae06 /ansible/roles/nova | |
| parent | c51cf93efd2c03e9582290af42fd82ef9cccf976 (diff) | |
| parent | 69c674b8d0b33a27e845fa450d8a179769f5cfb6 (diff) | |
| download | kolla-0963c2255a9718419c1cf8deaff350ea6ddc8472.tar.gz kolla-0963c2255a9718419c1cf8deaff350ea6ddc8472.zip | |
Merge "Deprecate scheduler_max_attempts option in nova"
Diffstat (limited to 'ansible/roles/nova')
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index a64565fc9..a686e0dc3 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -22,8 +22,6 @@ metadata_listen_port = {{ nova_metadata_port }} use_neutron = True firewall_driver = nova.virt.firewall.NoopFirewallDriver -scheduler_max_attempts = 10 - {% if neutron_plugin_agent == "openvswitch" %} linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver {% elif neutron_plugin_agent == "linuxbridge" %} @@ -206,3 +204,6 @@ debug = {{ nova_logging_debug }} [wsgi] api_paste_config = /etc/nova/api-paste.ini + +[scheduler] +max_attempts = 10 |