From 53a5164d82a7412d10cee634cd0755336f566e24 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 28 Apr 2017 15:35:48 +0000 Subject: [PATCH] Drop deprecated settings: enable_firewall and enable_vpn enable_firewall and enable_vpn settings have been deprecated since Juno release, but they have not been dropped yet just because we need a lot of changes in unit tests if dropped. The situation is resolved by the parent commit and we can now drop these settings safely. We can control whether a specific panel should be enabled or disabled via the pluggable panel mechanism ("enabled" dir). Also clean up enable_lb which has gone several releases ago. Closes-Bug: #1687185 Change-Id: I83fa48c5d9568a00294be7cd5f43ef181bc1f28d --- doc/source/topics/settings.rst | 38 ------------------- .../dashboards/project/firewalls/panel.py | 4 +- .../dashboards/project/vpn/panel.py | 4 +- .../local/local_settings.py.example | 3 -- ...s-enable-fireall-vpn-fad7c1a4cd96df2b.yaml | 12 ++++++ 5 files changed, 14 insertions(+), 47 deletions(-) create mode 100644 releasenotes/notes/drop-settings-enable-fireall-vpn-fad7c1a4cd96df2b.yaml diff --git a/doc/source/topics/settings.rst b/doc/source/topics/settings.rst index 42668015ec..3f9c38a70a 100644 --- a/doc/source/topics/settings.rst +++ b/doc/source/topics/settings.rst @@ -1232,8 +1232,6 @@ Default:: 'enable_distributed_router': False, 'enable_ha_router': False, 'enable_quotas': False, - 'enable_firewall': True, - 'enable_vpn': True, 'profile_support': None, 'supported_vnic_types': ["*"], 'supported_provider_types': ["*"], @@ -1241,7 +1239,6 @@ Default:: 'extra_provider_types': {}, 'enable_fip_topology_check': True, 'enable_ipv6': True, - 'enable_lb', True, 'default_dns_nameservers': [], 'physical_networks': [], } @@ -1300,41 +1297,6 @@ Enable support for Neutron quotas feature. To make this feature work appropriately, you need to use Neutron plugins with quotas extension support and quota_driver should be DbQuotaDriver (default config). -``enable_firewall`` -~~~~~~~~~~~~~~~~~~~ - -(Deprecated) - -Default: ``True`` - -Enables the firewall panel. firewall panel will be enabled when this -option is True and your Neutron deployment supports FWaaS. If you want -to disable firewall panel even when your Neutron supports FWaaS, set -it to False. - -This option is now marked as "deprecated" and will be removed in -Kilo or later release. The firewall panel is now enabled only -when FWaaS feature is available in Neutron and this option is no -longer needed. We suggest not to use this option to disable the -firewall panel from now on. - -``enable_vpn`` -~~~~~~~~~~~~~~ - -(Deprecated) - -Default: ``True`` - -Enables the VPN panel. VPN panel will be enabled when this option is True -and your Neutron deployment supports VPNaaS. If you want to disable -VPN panel even when your Neutron supports VPNaaS, set it to False. - -This option is now marked as "deprecated" and will be removed in -Kilo or later release. The VPN panel is now enabled only -when VPNaaS feature is available in Neutron and this option is no -longer needed. We suggest not to use this option to disable the -VPN panel from now on. - ``supported_provider_types`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/openstack_dashboard/dashboards/project/firewalls/panel.py b/openstack_dashboard/dashboards/project/firewalls/panel.py index 1e916a6c60..d51dedfb1a 100644 --- a/openstack_dashboard/dashboards/project/firewalls/panel.py +++ b/openstack_dashboard/dashboards/project/firewalls/panel.py @@ -31,9 +31,7 @@ class Firewall(horizon.Panel): if not request.user.has_perms(self.permissions): return False try: - if not neutron.is_service_enabled(request, - config_name='enable_firewall', - ext_name='fwaas'): + if not neutron.is_extension_supported(request, 'fwaas'): return False except Exception: LOG.error("Call to list enabled services failed. This is likely " diff --git a/openstack_dashboard/dashboards/project/vpn/panel.py b/openstack_dashboard/dashboards/project/vpn/panel.py index 9ce2fc2de8..171e4c0324 100644 --- a/openstack_dashboard/dashboards/project/vpn/panel.py +++ b/openstack_dashboard/dashboards/project/vpn/panel.py @@ -33,9 +33,7 @@ class VPN(horizon.Panel): if not request.user.has_perms(self.permissions): return False try: - if not neutron.is_service_enabled(request, - config_name='enable_vpn', - ext_name='vpnaas'): + if not neutron.is_extension_supported(request, 'vpnaas'): return False except Exception: LOG.error("Call to list enabled services failed. This is likely " diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 2443539426..ad1cf03167 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -285,9 +285,6 @@ OPENSTACK_NEUTRON_NETWORK = { 'enable_ipv6': True, 'enable_distributed_router': False, 'enable_ha_router': False, - 'enable_lb': True, - 'enable_firewall': True, - 'enable_vpn': True, 'enable_fip_topology_check': True, # Default dns servers you would like to use when a subnet is diff --git a/releasenotes/notes/drop-settings-enable-fireall-vpn-fad7c1a4cd96df2b.yaml b/releasenotes/notes/drop-settings-enable-fireall-vpn-fad7c1a4cd96df2b.yaml new file mode 100644 index 0000000000..f64b91cf2b --- /dev/null +++ b/releasenotes/notes/drop-settings-enable-fireall-vpn-fad7c1a4cd96df2b.yaml @@ -0,0 +1,12 @@ +--- +upgrade: + - | + The settings ``enable_firewall`` and ``enable_vpn`` which have been + deprecated since Juno release are now actually dropped. + If you are using these settings to disable FWaaS v1 and VPNaaS dashboards, + use ``REMOVE_PANEL`` of `the Pluggable Panel mechanism + ` + to disable these panels. Note that Horizon checks the availability of + FWaaS v1 and/or VPNaaS in your Neutron deploymennt and disables corresponding + panels if not available, so in most cases you do not need to take care of + the change.