]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
initial_tasks: make it possible to disable ansible 1282/head
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 21 Jun 2019 12:56:32 +0000 (14:56 +0200)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Mon, 24 Jun 2019 11:24:22 +0000 (13:24 +0200)
Introduce ceph_cm_ansible option in order to ommit 'ansible.cephlab'
task, so alternative way of target node provisioning can be selected

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
teuthology/run.py

index bd7f49ebe315a8e257be770c51cfb2391e5af34c..8286f7c2fb949e1c9bb97ac9a45224df5b65f0fe 100644 (file)
@@ -226,9 +226,13 @@ def get_initial_tasks(lock, config, machine_type):
         init_tasks.extend([
             {'pcp': None},
             {'selinux': None},
-            {'ansible.cephlab': None},
-            {'clock': None}
         ])
+    if config.get('ceph_cm_ansible', True):
+        init_tasks.append({'ansible.cephlab': None})
+
+    # clock_sync_task: 'clock' or 'clock.check'
+    clock_sync_task = config.get('clock_sync_task', 'clock')
+    init_tasks.append({clock_sync_task: None})
 
     if 'redhat' in config:
         init_tasks.extend([