From a249d15d00a5f895c5d16c29134a99df9212fe2d Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 17 Nov 2016 21:37:26 +0800
Subject: [PATCH] Deprecate scheduler_max_attempts option in nova
Option "scheduler_max_attempts" from group "DEFAULT" is deprecated.
Use option "max_attempts" from group "scheduler".
Change-Id: I7b8e803c3579c53629a63912e2f6faa65a31f098
Closes-Bug: #1642590
---
ansible/roles/nova/templates/nova.conf.j2 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 6706d16e96..93797fc277 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" %}
@@ -205,3 +203,6 @@ debug = {{ nova_logging_debug }}
[wsgi]
api_paste_config = /etc/nova/api-paste.ini
+
+[scheduler]
+max_attempts = 10