From 317d9d8f13e8a34af189504ae1258d315154cc82 Mon Sep 17 00:00:00 2001
From: Eric Brown <browne@vmware.com>
Date: Mon, 4 May 2015 15:30:58 -0700
Subject: [PATCH] Deprecate nova ironic driver's admin_auth_token

The admin_auth_token config option is deprecated in the keystone
client and should similarly be deprecated in the ironic driver.

Change-Id: Ia9981b831ed9159ca3a01a8bb9d5eab7309f9a65
Closes-Bug: #1451605
---
 nova/virt/ironic/driver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py
index c50c1dc609..c52d1f394a 100644
--- a/nova/virt/ironic/driver.py
+++ b/nova/virt/ironic/driver.py
@@ -74,7 +74,10 @@ opts = [
                help='Ironic keystone admin password.'),
     cfg.StrOpt('admin_auth_token',
                secret=True,
-               help='Ironic keystone auth token.'),
+               deprecated_for_removal=True,
+               help='Ironic keystone auth token.'
+                    'DEPRECATED: use admin_username, admin_password, and '
+                    'admin_tenant_name instead'),
     cfg.StrOpt('admin_url',
                help='Keystone public API endpoint.'),
     cfg.StrOpt('client_log_level',