From 75e685d40d4e02d38e5dfa1700b4fa6734291073 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Tue, 10 Jan 2017 07:07:35 -0500
Subject: [PATCH] Properly deprecate service_instance_network_helper_type

Change [1] removed the ``service_instance_network_helper_type``
option as part of the removal of nova network helper support
for the service instance module.

Put the option back in but deprecate it so that operators with
this configuration can see that it is no longer used.

TrivialFix

[1] I846b760fa7c01f7f86768399a2bfad9ced7e57cd

Change-Id: I14768a237b9d7ebc5aa55733bc6bc0531ec3fbb4
---
 manila/share/drivers/service_instance.py                  | 8 ++++++++
 ...e-instance-network-helper-option-82ff62a038f2bfa3.yaml | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/deprecate-service-instance-network-helper-option-82ff62a038f2bfa3.yaml

diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py
index 1c129a2f74..27b671d66c 100644
--- a/manila/share/drivers/service_instance.py
+++ b/manila/share/drivers/service_instance.py
@@ -101,6 +101,14 @@ share_servers_handling_mode_opts = [
         help="Attach share server directly to share network. "
              "Used only with Neutron and "
              "if driver_handles_share_servers=True."),
+    cfg.StrOpt(
+        "service_instance_network_helper_type",
+        default=NEUTRON_NAME,
+        deprecated_for_removal=True,
+        deprecated_reason="This option isn't used any longer because "
+                          "nova networking is no longer supported.",
+        help="Used to select between neutron and nova helpers when "
+             "driver_handles_share_servers=True. Obsolete."),
     cfg.StrOpt(
         "admin_network_id",
         help="ID of neutron network used to communicate with admin network,"
diff --git a/releasenotes/notes/deprecate-service-instance-network-helper-option-82ff62a038f2bfa3.yaml b/releasenotes/notes/deprecate-service-instance-network-helper-option-82ff62a038f2bfa3.yaml
new file mode 100644
index 0000000000..4b951ddcaa
--- /dev/null
+++ b/releasenotes/notes/deprecate-service-instance-network-helper-option-82ff62a038f2bfa3.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - Deprecated the ``service_instance_network_helper_type`` option
+    for removal.  This option is no longer used for anything since
+    nova networking is no longer supported.