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 aa1c1b41b863d09f642da1e23762b81aa351b95b..554f2bf4c1b6b92c97caf6df568fcbccba1399a7 100644 (file)
--- 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([