openstack
/
manila
Code Issues Proposed changes

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
This commit is contained in:
Tom Barron 2017-01-10 07:07:35 -05:00
parent 966b1621d3
commit 75e685d40d
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/share/drivers/service_instance.py
View File

@ -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,"

5
releasenotes/notes/deprecate-service-instance-network-helper-option-82ff62a038f2bfa3.yaml Normal file
View File

@ -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.