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.