commit 97d31e8cc5ba18da8a72b64eac517add504f0a56
author Mykyta Karpin <mkarpin@mirantis.com> Fri Oct 12 16:20:37 2018 +0300
committer Mykyta Karpin <mkarpin@mirantis.com> Fri Oct 12 16:31:23 2018 +0300
tree a9b5cf1e2dbe7b08c929b8cdd84396713476c6c7
parent c64f7863c6b8a0622cc561bfdc9ac134f473cd79

Make keystonerc and image file creation optional

In some cases keystone rc as well as image file
creation can be done manually before runtest execution,
also in Salt 2017.7 salt runner works unstable in case with
put local image file state. So this commit adds ability to disable
keystone rc and image file creation.

Change-Id: I86385ef7e3e1df069b108271b96fa86434e9074f
Related-Prod: https://mirantis.jira.com/browse/PROD-23915

.gitreview

diff --git a/.gitreview b/.gitreview
index 442948f..f64ef69 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=172.16.48.254
+host=gerrit.mcp.mirantis.net
 port=29418
 project=salt-formulas/runtest.git

runtest/map.jinja

diff --git a/runtest/map.jinja b/runtest/map.jinja
index 2067741..4a9e2b8 100644
--- a/runtest/map.jinja
+++ b/runtest/map.jinja
@@ -9,7 +9,9 @@
         'cfg_dir': '/root/',
         'cfg_name': 'tempest.conf',
         'keystonerc': '/root/keystonercv3',
-        'regenerate_conf': false
+        'regenerate_conf': false,
+        'put_keystone_rc_enabled': true,
+        'put_local_image_file_enabled': true
     }
 }, grain='os', merge=salt['pillar.get']('runtest', {}).get('tempest', {}), base='default') %}
 

runtest/tempest.sls

diff --git a/runtest/tempest.sls b/runtest/tempest.sls
index a2d54e4..fbd60f5 100644
--- a/runtest/tempest.sls
+++ b/runtest/tempest.sls
@@ -14,7 +14,7 @@
     - require:
       - file: tempest_config_dir
 
-{%- if tempest.test_target is defined %}
+  {%- if tempest.test_target is defined %}
 create_on_target:
   salt.function:
     - tgt: {{ tempest.test_target }}
@@ -39,6 +39,7 @@
       - 'mine_function=cmd.shell'
       - 'cat {{ tempest.keystonerc }}'
 
+    {%- if tempest.put_keystone_rc_enabled %}
 put_keystone_rc_file:
   salt.state:
     - tgt: {{ tempest.test_target }}
@@ -47,7 +48,9 @@
     - concurrent: true
     - require:
       - salt: mine_send_keystonerc_file
+    {%- endif %}
 
+    {%- if tempest.put_local_image_file_enabled %}
 put_local_image_file:
   salt.state:
     - tgt: {{ tempest.test_target }}
@@ -58,13 +61,14 @@
     - require:
       - tempest_config_file
     {# Sometimes this task hangs infinitely when using salt 2017.7.0 #}
-    {%- if salt['grains.get']('saltversion') >= '2017.7.0' %}
+      {%- if salt['grains.get']('saltversion') >= '2017.7.0' %}
     - retry:
         attempts: 3
         until: True
         interval: 10
+      {%- endif %}
     {%- endif %}
 
-{%- endif %}
+  {%- endif %}
 
 {%- endif -%}