From 2b872538862b03b0e96b3024601454de38ca457c Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 16 Nov 2016 23:49:51 +0800
Subject: [PATCH] Deprecate scheduler_max_attempts option

Option "scheduler_max_attempts" from group "DEFAULT" is deprecated.
Use option "max_attempts" from group "scheduler".

Change-Id: Ibdb4efc04dcec22a9223cefb0fa10b7c4b5015e0
Closes-Bug: #1642310
---
 templates/nova.conf.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 26e60c83..f8a1ed4b 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -51,7 +51,6 @@ scheduler_default_filters = {{ nova_scheduler_default_filters }}
 scheduler_driver_task_period = {{ nova_scheduler_driver_task_period }}
 scheduler_host_manager = {{ nova_scheduler_host_manager }}
 scheduler_host_subset_size = {{ nova_scheduler_host_subset_size }}
-scheduler_max_attempts = {{ nova_scheduler_max_attempts }}
 scheduler_weight_classes = {{ nova_scheduler_weight_classes }}
 scheduler_use_baremetal_filters = {{ nova_scheduler_use_baremetal_filters }}
 scheduler_tracks_instance_changes = {{ nova_scheduler_tracks_instance_changes }}
@@ -302,3 +301,6 @@ disk_cachemodes = {{ nova_libvirt_disk_cachemodes }}
 
 [wsgi]
 api_paste_config = /etc/nova/api-paste.ini
+
+[scheduler]
+max_attempts = {{ nova_scheduler_max_attempts }}