Merge "Remove 'allow_port_security_disabled' option"
This commit is contained in:
+5
@@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The deprecated config option 'allow_port_security_disabled' from compute_feature_enabled
|
||||
group has been removed.
|
||||
@@ -328,15 +328,6 @@ compute_features_group = cfg.OptGroup(name='compute-feature-enabled',
|
||||
title="Enabled Compute Service Features")
|
||||
|
||||
ComputeFeaturesGroup = [
|
||||
# NOTE(mriedem): This is a feature toggle for bug 1175464 which is fixed in
|
||||
# mitaka and newton. This option can be removed after liberty-eol.
|
||||
cfg.BoolOpt('allow_port_security_disabled',
|
||||
default=True,
|
||||
help='Does the test environment support creating ports in a '
|
||||
'network where port security is disabled?',
|
||||
deprecated_for_removal=True,
|
||||
deprecated_reason='This config switch was added for Liberty '
|
||||
'which is not supported anymore.'),
|
||||
cfg.BoolOpt('disk_config',
|
||||
default=True,
|
||||
help="If false, skip disk config tests"),
|
||||
|
||||
@@ -625,9 +625,6 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest):
|
||||
@test.attr(type='slow')
|
||||
@test.requires_ext(service='network', extension='port-security')
|
||||
@decorators.idempotent_id('13ccf253-e5ad-424b-9c4a-97b88a026699')
|
||||
@testtools.skipUnless(
|
||||
CONF.compute_feature_enabled.allow_port_security_disabled,
|
||||
'Port security must be enabled.')
|
||||
# TODO(mriedem): We shouldn't actually need to check this since neutron
|
||||
# disables the port_security extension by default, but the problem is nova
|
||||
# assumes port_security_enabled=True if it's not set on the network
|
||||
|
||||
Reference in New Issue
Block a user