From 8dff3d498032fe7bb5898f7173a45d188c871ba1 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Wed, 22 Aug 2018 14:29:06 -0500
Subject: [PATCH] Remove deprecated HPE Lefthand config opts

Several configuration options were renamed as part of the driver rename
in the Mitaka release. This removes the deprecated_name for these
options.

Change-Id: I8bf5570960728b3bb65631ce02850c120af40577
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 .../volume/drivers/hpe/hpe_lefthand_iscsi.py   | 18 ++++++------------
 .../hpelh-deprecations-eb7716a0b02f145e.yaml   | 10 ++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/hpelh-deprecations-eb7716a0b02f145e.yaml

diff --git a/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py b/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
index 2ea0b4f1387..9d2374531d8 100644
--- a/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
+++ b/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
@@ -69,30 +69,24 @@ hpelefthand_opts = [
     cfg.URIOpt('hpelefthand_api_url',
                default=None,
                help="HPE LeftHand WSAPI Server Url like "
-                    "https://<LeftHand ip>:8081/lhos",
-               deprecated_name='hplefthand_api_url'),
+                    "https://<LeftHand ip>:8081/lhos"),
     cfg.StrOpt('hpelefthand_username',
                default=None,
-               help="HPE LeftHand Super user username",
-               deprecated_name='hplefthand_username'),
+               help="HPE LeftHand Super user username"),
     cfg.StrOpt('hpelefthand_password',
                default=None,
                help="HPE LeftHand Super user password",
-               secret=True,
-               deprecated_name='hplefthand_password'),
+               secret=True),
     cfg.StrOpt('hpelefthand_clustername',
                default=None,
-               help="HPE LeftHand cluster name",
-               deprecated_name='hplefthand_clustername'),
+               help="HPE LeftHand cluster name"),
     cfg.BoolOpt('hpelefthand_iscsi_chap_enabled',
                 default=False,
                 help='Configure CHAP authentication for iSCSI connections '
-                '(Default: Disabled)',
-                deprecated_name='hplefthand_iscsi_chap_enabled'),
+                '(Default: Disabled)'),
     cfg.BoolOpt('hpelefthand_debug',
                 default=False,
-                help="Enable HTTP debugging to LeftHand",
-                deprecated_name='hplefthand_debug'),
+                help="Enable HTTP debugging to LeftHand"),
     cfg.PortOpt('hpelefthand_ssh_port',
                 default=16022,
                 help="Port number of SSH service."),
diff --git a/releasenotes/notes/hpelh-deprecations-eb7716a0b02f145e.yaml b/releasenotes/notes/hpelh-deprecations-eb7716a0b02f145e.yaml
new file mode 100644
index 00000000000..486d4067481
--- /dev/null
+++ b/releasenotes/notes/hpelh-deprecations-eb7716a0b02f145e.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    HPE LeftHand config options ``hplefthand_api_url``, ``hplefthand_username``,
+    ``hplefthand_password``, ``hplefthand_clustername``,
+    ``hplefthand_iscsi_chap_enabled``, and ``hplefthand_debug`` were deprecated
+    in the Mitaka release and have now been removed. The corresponding
+    ``hpelefthand_api_url``, ``hpelefthand_username``, ``hpelefthand_password``,
+    ``hpelefthand_clustername``, ``hpelefthand_iscsi_chap_enabled``, and
+    ``hpelefthand_debug`` should be used instead.