Added CONF.validation entry security_method
Added a config entry for defaulting the security_group and
security_group_rules instead of just hard-coding it if no
variable is provided.
This should still provide the same functionality as previously
written but give the option to be more flexible for
different environments that don't need the security_group
variables enabled.
Change-Id: Ic78805849d6dc1950f334d0142714b62a98ccf0a
Closes-Bug: #1486198
diff --git a/tempest/config.py b/tempest/config.py
index 0262d1b..663a9f9 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -611,6 +611,12 @@
' validation resources to enable remote access',
deprecated_opts=[cfg.DeprecatedOpt('run_ssh',
group='compute')]),
+ cfg.BoolOpt('security_group',
+ default=True,
+ help='Enable/disable security groups.'),
+ cfg.BoolOpt('security_group_rules',
+ default=True,
+ help='Enable/disable security group rules.'),
cfg.StrOpt('connect_method',
default='floating',
choices=['fixed', 'floating'],
diff --git a/tempest/test.py b/tempest/test.py
index df6b30d..b664b47 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -530,9 +530,10 @@
else:
floating_ip = False
if security_group is None:
- security_group = True
+ security_group = CONF.validation.security_group
if security_group_rules is None:
- security_group_rules = True
+ security_group_rules = CONF.validation.security_group_rules
+
if not cls.validation_resources:
cls.validation_resources = {
'keypair': keypair,