Update runtestmanager and models
Update contexts
fix runtestmanager
Change-Id: I82ad9232c1cc72ede39ed31a29bf2b4b11fe988f
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 3723fb6..7325e2e 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -103,14 +103,11 @@
def prepare(self):
salt_call_cmd = "salt-call -l info --hard-crash --state-output=mixed "
- barbican_enabled = self.__salt_api.get_single_pillar(
- tgt='ctl01*', pillar='_param:barbican_enabled')
barbican_integration = self.__salt_api.get_single_pillar(
tgt="ctl01*",
pillar="_param:barbican_integration_enabled")
- LOG.info("Barbican enabled {0}: Barbican integration {1}".format(
- barbican_enabled, barbican_integration))
+ LOG.info("Barbican integration {0}".format(barbican_integration))
commands = [
{
'description': ("Install docker-ce package and "
@@ -133,7 +130,7 @@
"runtest.orchestrate.tempest")},
]
- if barbican_enabled:
+ if barbican_integration:
commands.append({
'description': "Configure barbican",
'node_name': self.master_name,
@@ -141,13 +138,7 @@
salt_call_cmd +
" state.sls barbican.client && " +
salt_call_cmd +
- " state.sls runtest.test_accounts")},
- )
- if barbican_integration:
- commands.append({
- 'description': "Configure barbican",
- 'node_name': self.master_name,
- 'cmd': ("set -ex;" +
+ " state.sls runtest.test_accounts" +
salt_call_cmd +
" state.sls runtest.barbican_sign_image")},
)