From b8a553dfedc9fb2667945cf7b158c64edd05a05e Mon Sep 17 00:00:00 2001
From: Ivan Kolodyazhny <e0ne@e0ne.info>
Date: Fri, 15 Dec 2017 17:02:55 +0200
Subject: [PATCH] Remove deprecated 'pybasedir' config option

'pybasedir' was deprecated four years ago and now it's safe to be removed.

Change-Id: Ie4e7d339103ec946ec2a011ad795db4511a7f388
---
 cinder/common/config.py                                      | 1 -
 .../remove-pybasedir-config-option-572604d26a57ba5e.yaml     | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/remove-pybasedir-config-option-572604d26a57ba5e.yaml

diff --git a/cinder/common/config.py b/cinder/common/config.py
index 9684154f9c9..c186645dfd0 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -39,7 +39,6 @@ logging.register_options(CONF)
 core_opts = [
     cfg.StrOpt('state_path',
                default='/var/lib/cinder',
-               deprecated_name='pybasedir',
                help="Top-level directory for maintaining cinder's state"), ]
 
 CONF.register_cli_opts(core_opts)
diff --git a/releasenotes/notes/remove-pybasedir-config-option-572604d26a57ba5e.yaml b/releasenotes/notes/remove-pybasedir-config-option-572604d26a57ba5e.yaml
new file mode 100644
index 00000000000..1da103ef7e7
--- /dev/null
+++ b/releasenotes/notes/remove-pybasedir-config-option-572604d26a57ba5e.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The old deprecated ``pybasedir`` option has been removed.
+    Use the ``state_path`` instead.