Import Upstream version 4.12.4
This commit is contained in:
@@ -39,6 +39,8 @@ class IntegrationTest:
|
||||
topology = None
|
||||
domain_level = None
|
||||
fips_mode = None
|
||||
random_serial = False
|
||||
token_password = None
|
||||
|
||||
@classmethod
|
||||
def host_by_role(cls, role):
|
||||
@@ -72,12 +74,13 @@ class IntegrationTest:
|
||||
|
||||
@classmethod
|
||||
def install(cls, mh):
|
||||
extra_args = []
|
||||
if cls.domain_level is not None:
|
||||
domain_level = cls.domain_level
|
||||
else:
|
||||
domain_level = cls.master.config.domain_level
|
||||
|
||||
if cls.master.config.fips_mode: # pylint: disable=using-constant-test
|
||||
if cls.master.config.fips_mode:
|
||||
cls.fips_mode = True
|
||||
if cls.fips_mode:
|
||||
cls.enable_fips_mode()
|
||||
@@ -85,9 +88,13 @@ class IntegrationTest:
|
||||
if cls.topology is None:
|
||||
return
|
||||
else:
|
||||
if cls.token_password:
|
||||
extra_args.extend(('--token-password', cls.token_password,))
|
||||
tasks.install_topo(cls.topology,
|
||||
cls.master, cls.replicas,
|
||||
cls.clients, domain_level)
|
||||
cls.clients, domain_level,
|
||||
random_serial=cls.random_serial,
|
||||
extra_args=extra_args,)
|
||||
@classmethod
|
||||
def uninstall(cls, mh):
|
||||
for replica in cls.replicas:
|
||||
|
||||
Reference in New Issue
Block a user