Merge "Drop deprecated settings: enable_firewall and enable_vpn"
This commit is contained in:
commit
071ba2cb08
@ -1232,8 +1232,6 @@ Default::
|
|||||||
'enable_distributed_router': False,
|
'enable_distributed_router': False,
|
||||||
'enable_ha_router': False,
|
'enable_ha_router': False,
|
||||||
'enable_quotas': False,
|
'enable_quotas': False,
|
||||||
'enable_firewall': True,
|
|
||||||
'enable_vpn': True,
|
|
||||||
'profile_support': None,
|
'profile_support': None,
|
||||||
'supported_vnic_types': ["*"],
|
'supported_vnic_types': ["*"],
|
||||||
'supported_provider_types': ["*"],
|
'supported_provider_types': ["*"],
|
||||||
@ -1241,7 +1239,6 @@ Default::
|
|||||||
'extra_provider_types': {},
|
'extra_provider_types': {},
|
||||||
'enable_fip_topology_check': True,
|
'enable_fip_topology_check': True,
|
||||||
'enable_ipv6': True,
|
'enable_ipv6': True,
|
||||||
'enable_lb', True,
|
|
||||||
'default_dns_nameservers': [],
|
'default_dns_nameservers': [],
|
||||||
'physical_networks': [],
|
'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
|
appropriately, you need to use Neutron plugins with quotas extension support
|
||||||
and quota_driver should be DbQuotaDriver (default config).
|
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``
|
``supported_provider_types``
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
@ -31,9 +31,7 @@ class Firewall(horizon.Panel):
|
|||||||
if not request.user.has_perms(self.permissions):
|
if not request.user.has_perms(self.permissions):
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
if not neutron.is_service_enabled(request,
|
if not neutron.is_extension_supported(request, 'fwaas'):
|
||||||
config_name='enable_firewall',
|
|
||||||
ext_name='fwaas'):
|
|
||||||
return False
|
return False
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.error("Call to list enabled services failed. This is likely "
|
LOG.error("Call to list enabled services failed. This is likely "
|
||||||
|
@ -33,9 +33,7 @@ class VPN(horizon.Panel):
|
|||||||
if not request.user.has_perms(self.permissions):
|
if not request.user.has_perms(self.permissions):
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
if not neutron.is_service_enabled(request,
|
if not neutron.is_extension_supported(request, 'vpnaas'):
|
||||||
config_name='enable_vpn',
|
|
||||||
ext_name='vpnaas'):
|
|
||||||
return False
|
return False
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.error("Call to list enabled services failed. This is likely "
|
LOG.error("Call to list enabled services failed. This is likely "
|
||||||
|
@ -285,9 +285,6 @@ OPENSTACK_NEUTRON_NETWORK = {
|
|||||||
'enable_ipv6': True,
|
'enable_ipv6': True,
|
||||||
'enable_distributed_router': False,
|
'enable_distributed_router': False,
|
||||||
'enable_ha_router': False,
|
'enable_ha_router': False,
|
||||||
'enable_lb': True,
|
|
||||||
'enable_firewall': True,
|
|
||||||
'enable_vpn': True,
|
|
||||||
'enable_fip_topology_check': True,
|
'enable_fip_topology_check': True,
|
||||||
|
|
||||||
# Default dns servers you would like to use when a subnet is
|
# Default dns servers you would like to use when a subnet is
|
||||||
|
@ -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
|
||||||
|
<https://docs.openstack.org/developer/horizon/topics/settings.html#pluggable-settings-for-panels>`
|
||||||
|
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.
|
Loading…
Reference in New Issue
Block a user