Merge pull request ceph#1067 from ceph/wip-change-order

[task/internal]: run the redhat internal task after ansible.cephlab task
yhung124 · Apr 26, 2017 · f4430d9 · f4430d9
2 parents a4a6d67 + 277a431
commit f4430d9
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/teuthology/run.py b/teuthology/run.py
@@ -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