From 759e91632bdac82135577d6dc9eb18332ff501fc Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Mon, 16 May 2016 09:15:13 -0400
Subject: [PATCH] Remove [conductor]/clean_nodes config option

This was deprecated a while ago and was slated for removal during
Newton. Do it.

Change-Id: Iac94720c357350160521688adb68d8bef7c04aae
---
 etc/ironic/ironic.conf.sample                               | 1 -
 ironic/conductor/manager.py                                 | 3 ---
 releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml | 5 +++++
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml

diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 895af9eaec..9cb29db807 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -671,7 +671,6 @@
 # significantly longer. In an environment where all tenants
 # are trusted (eg, because there is only one tenant), this
 # option could be safely disabled. (boolean value)
-# Deprecated group/name - [conductor]/clean_nodes
 #automated_clean = true
 
 # Timeout (seconds) to wait for a callback from the ramdisk
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index 092b9e5446..c665ee200e 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -152,11 +152,8 @@ conductor_opts = [
                default=1800,
                help=_('Timeout (seconds) for waiting for node inspection. '
                       '0 - unlimited.')),
-    # TODO(rloo): Remove support for deprecated name 'clean_nodes' in Newton
-    #             cycle.
     cfg.BoolOpt('automated_clean',
                 default=True,
-                deprecated_name='clean_nodes',
                 help=_('Enables or disables automated cleaning. Automated '
                        'cleaning is a configurable set of steps, '
                        'such as erasing disk drives, that are performed on '
diff --git a/releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml b/releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml
new file mode 100644
index 0000000000..bc5dddc9e9
--- /dev/null
+++ b/releasenotes/notes/remove-clean-nodes-38cfa633ca518f99.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - Remove the deprecated "[conductor]/clean_nodes" option.
+    Configuration files should instead use the
+    "[conductor]/automated_clean" option.