From befae05875474d3892dce20416455c11a2d34cca Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Wed, 14 Mar 2018 17:06:34 -0700 Subject: [PATCH] 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 --- teuthology/run.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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([ -- 2.39.5