From eb2954ae808fd653d7a8e4ffbb298a4e7b0266ff Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Mon, 3 Apr 2017 04:05:55 -0400 Subject: [PATCH] Remove service_instance_network_helper_type option It is no longer used and was deprecated [1] in the previous release. TrivialFix [1] I14768a237b9d7ebc5aa55733bc6bc0531ec3fbb4 Change-Id: If6375322e254fa6f13649411aef2c92bf368e7ed --- manila/share/drivers/service_instance.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py index d94aceb095..2834bf8e2b 100644 --- a/manila/share/drivers/service_instance.py +++ b/manila/share/drivers/service_instance.py @@ -101,14 +101,6 @@ 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,"