]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
change the order when redhat internal task is run 1067/head
authorVasu Kulkarni <vasu@redhat.com>
Thu, 20 Apr 2017 18:08:49 +0000 (11:08 -0700)
committerVasu Kulkarni <vasu@redhat.com>
Thu, 20 Apr 2017 20:32:31 +0000 (13:32 -0700)
ceph-ansible task is modifying some of the repo's set earlier
and affecting cdn runs, change the order to run it after ansible
task is run.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
teuthology/run.py

index 3ec1c12f89d455435df55aeb5ca765c9321f6874..7bfca604aa28bd938dd43c7d1f9941624710de52 100644 (file)
@@ -217,14 +217,6 @@ def get_initial_tasks(lock, config, machine_type):
         ])
     init_tasks.append({'internal.timer': None})
 
-    if 'redhat' in config:
-        init_tasks.extend([
-            {'internal.setup_cdn_repo': None},
-            {'internal.setup_base_repo': None},
-            {'internal.setup_additional_repo': None},
-            {'kernel.install_latest_rh_kernel': None}
-        ])
-
     if 'roles' in config:
         init_tasks.extend([
             {'pcp': None},
@@ -233,6 +225,14 @@ def get_initial_tasks(lock, config, machine_type):
             {'clock': None}
         ])
 
+    if 'redhat' in config:
+        init_tasks.extend([
+            {'internal.setup_cdn_repo': None},
+            {'internal.setup_base_repo': None},
+            {'internal.setup_additional_repo': None},
+            {'kernel.install_latest_rh_kernel': None}
+        ])
     return init_tasks