commit 8b70b904d110b910586070ffb747434c0b2835d6
author Tatyana Leontovich <tleontovich@mirantis.com> Fri Nov 10 20:44:08 2017 +0200
committer Tatyanka Leontovich <tleontovich@mirantis.com> Mon Nov 13 08:44:10 2017 -0500
tree f535accce4ad8cbef9805c92d7ab33a641871726
parent 222ba8e54d54812c263d09175450c4003dc48e5e

Fix image source

Change-Id: Idd9eb0215f90f3b31ce2dad2cb0baf215a138e70

tcp_tests/managers/openstack_manager.py

diff --git a/tcp_tests/managers/openstack_manager.py b/tcp_tests/managers/openstack_manager.py
index bd3e889..249c30c 100644
--- a/tcp_tests/managers/openstack_manager.py
+++ b/tcp_tests/managers/openstack_manager.py
@@ -15,6 +15,7 @@
 
 from tcp_tests.managers.execute_commands import ExecuteCommandsMixin
 from tcp_tests import logger
+from tcp_tests import settings
 
 LOG = logger.logger
 
@@ -41,10 +42,13 @@
 
     def run_tempest(
             self,
-            image_name='rally-tempest:with_designate',
             target='gtw01', pattern=None,
             conf_name='lvm_mcp.conf',
-            registry='docker-sandbox.sandbox.mirantis.net/rally-tempest/'):
+            registry=None):
+        if not registry:
+            registry = ('{}/mirantis'
+                        '/oscore/rally-tempest'
+                        ':latest'.format(settings.DOCKER_REGISTRY))
         target_name = [node_name for node_name
                        in self.__underlay.node_names() if target in node_name]
 
@@ -54,17 +58,17 @@
                    "-e SKIP_LIST=mcp_skip.list "
                    "-e SOURCE_FILE=keystonercv3  "
                    "-e CUSTOM='--pattern {1}' "
-                   "-v /root/:/home/rally {2}{3} "
+                   "-v /root/:/home/rally {2} "
                    "-v /etc/ssl/certs/:/etc/ssl/certs/ >> image.output"
-                   .format(conf_name, pattern, registry, image_name))
+                   .format(conf_name, pattern, registry))
         else:
             cmd = ("docker run --rm --net=host  "
                    "-e TEMPEST_CONF={0} "
                    "-e SKIP_LIST=mcp_skip.list "
                    "-e SOURCE_FILE=keystonercv3  "
-                   "-v /root/:/home/rally {2}{3} "
+                   "-v /root/:/home/rally {2}"
                    "-v /etc/ssl/certs/:/etc/ssl/certs/ >> image.output"
-                   .format(conf_name, pattern, registry, image_name))
+                   .format(conf_name, pattern, registry))
         LOG.info("Restart keepalived service before running tempest tests")
         restart_keepalived_cmd = ("salt --hard-crash "
                                   "--state-output=mixed "