commit ed91a0d833d9e42e4ea8f6396e0617b6717906a8
author ibumarskov <bumarskov@gmail.com> Tue Nov 21 10:17:53 2017 +0300
committer ibumarskov <bumarskov@gmail.com> Tue Nov 21 10:27:13 2017 +0300
tree ddcbf5b539ddd135444f11cac0bb5d6174a1435a
parent 9498c4a35ed75946b277d564958da9249df108e6

Move docker name to settings.

Change-Id: I2a3679e99ee79f8b12a78e8a90c7dd409daeb309

tcp_tests/managers/openstack_manager.py

diff --git a/tcp_tests/managers/openstack_manager.py b/tcp_tests/managers/openstack_manager.py
index 24971b8..89559b1 100644
--- a/tcp_tests/managers/openstack_manager.py
+++ b/tcp_tests/managers/openstack_manager.py
@@ -46,9 +46,8 @@
             conf_name='lvm_mcp.conf',
             registry=None):
         if not registry:
-            registry = ('{}/mirantis'
-                        '/oscore/rally-tempest'
-                        ':latest'.format(settings.DOCKER_REGISTRY))
+            registry = ('{0}/{1}'.format(settings.DOCKER_REGISTRY,
+                                         settings.DOCKER_NAME))
         target_name = [node_name for node_name
                        in self.__underlay.node_names() if target in node_name]
 

tcp_tests/settings.py

diff --git a/tcp_tests/settings.py b/tcp_tests/settings.py
index 70b66d9..a1b296a 100644
--- a/tcp_tests/settings.py
+++ b/tcp_tests/settings.py
@@ -53,6 +53,8 @@
 
 DOCKER_REGISTRY = os.environ.get('DOCKER_REGISTRY',
                                  'docker-prod-virtual.docker.mirantis.net')
+DOCKER_NAME = os.environ.get('DOCKER_NAME',
+                             'mirantis/oscore/rally-tempest:latest')
 
 PATTERN = os.environ.get('PATTERN', None)
 RUN_TEMPEST = get_var_as_bool('RUN_TEMPEST', False)