From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 15 Mar 2018 00:06:34 +0000 (-0700)
Subject: Disable running cm-ansible by default, FOG images have already
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=30aff27801d432a1c1692fcff459e6e7963e86f5;p=teuthology.git

Disable running cm-ansible by default, FOG images have already
run cm-ansible code and it would be redundant to run them again.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/teuthology/run.py b/teuthology/run.py
index aa1c1b41b8..554f2bf4c1 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -231,10 +231,11 @@ def get_initial_tasks(lock, config, machine_type):
             {'selinux': None},
             {'clock': None}
         ])
-    if 'run-cm-ansible' in config:
-        init_tasks.extend([
-             {'ansible.cephlab': None},
-        ])
+    # dont run cm-ansible by default unless requested in config
+    # nodes are reimaged by FOG and the images provided
+    # by FOG have already gone through cm-ansible run
+    if config.get('run-cm-ansible', False):
+        init_tasks.extend([{'ansible.cephlab': None}])
 
     if 'redhat' in config:
         init_tasks.extend([