commit 48a33c13617d2a6e163bd7ef6a46062c14e9b086
author Tatyana Leontovich <tleontovich@mirantis.com> Thu Jan 03 02:19:25 2019 +0200
committer Tatyana Leontovich <tleontovich@mirantis.com> Fri Jan 04 01:22:23 2019 +0200
tree 2b4785ab96c217080a024e70ebc81e5d9481025a
parent 26a9fc8ff40410d16b6db9874fb591e713916fa5

Fix queens deploy

Change-Id: I15447ff8e27781a5a604234ce746815d97cb4dc4

tcp_tests/managers/k8smanager.py

diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index d229e2f..7b03fe9 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -418,7 +418,7 @@
             for log_file in files:
                 cmd = "rsync -r \"{0}:/root/{1}\" /root/".format(
                     node, log_file)
-                r.check_call(cmd, raise_on_err=False)
+                r.check_call(cmd, raise_on_err=True)
                 LOG.info("Downloading the artifact {0}".format(log_file))
                 r.download(destination=log_file, target=os.getcwd())
         self.store_server_version(os.path.join(os.getcwd(), 'env_k8s_version'))

tcp_tests/managers/runtestmanager.py

diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index e29f072..bc39643 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -33,15 +33,14 @@
     image_version = settings.TEMPEST_IMAGE_VERSION
     container_name = 'run-tempest-ci'
     master_host = "cfg01"
-    control_host = "ctl01"
-    compute_host = "cmp"
     class_name = "runtest"
     run_cmd = '/bin/bash -c "run-tempest"'
 
     def __init__(self, config, underlay, salt_api, cluster_name,
                  domain_name, tempest_threads,
                  tempest_pattern=settings.TEMPEST_PATTERN,
-                 run_cmd=None, target='gtw01'):
+                 run_cmd=None, target='gtw01*', control_host='ctl01*',
+                 compute_host='cmp001*'):
         self.__config = config
         self.underlay = underlay
         self.__salt_api = salt_api
@@ -53,10 +52,8 @@
         self.target_name = self.underlay.get_target_node_names(target)[0]
         self.master_name = self.underlay.get_target_node_names(
             self.master_host)[0]
-        self.control_name = self.underlay.get_target_node_names(
-            self.control_host)[0]
-        self.compute_name = self.underlay.get_target_node_names(
-            self.compute_host)[0]
+        self.control_name = control_host
+        self.compute_name = compute_host
         self.barbican = False
 
     @property