From 50e6b7af3662ab89eefc565c182ef14bb20f08d3 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@huawei.com>
Date: Tue, 13 Mar 2018 14:33:37 -0500
Subject: [PATCH] Clean out config deprecation information

Nova settings were deprecated, then removed in change
Ic112a68101c0dcb14da0db06c62ae190474a37d9. Some legacy
info was left behind in one of the new options referring
to the old config setting that should now be removed.

Change-Id: I031e5ffbc11c4b044f3baf808d852ce871a2d6c5
---
 cinder/compute/nova.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index e54b748ef65..d81def661b5 100644
--- a/cinder/compute/nova.py
+++ b/cinder/compute/nova.py
@@ -32,9 +32,7 @@ from cinder import service_auth
 nova_opts = [
     cfg.StrOpt('region_name',
                help='Name of nova region to use. Useful if keystone manages '
-                    'more than one region.',
-               deprecated_name="os_region_name",
-               deprecated_group="DEFAULT"),
+                    'more than one region.'),
     cfg.StrOpt('interface',
                default='public',
                choices=['public', 'admin', 'internal'],