changed to include_tasks from import_task for OS specific tasks

ceph · Jul 1, 2024 · 83e0c42 · 83e0c42
1 parent 43cfdf4
commit 83e0c42
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml
@@ -41,21 +41,20 @@
       - ceph-radosgw
       - rbd-mirror
   tasks:
-    - name: import_role ceph_defaults
+    - name: Import_role ceph_defaults
       import_role:
         name: ceph_defaults
 
-    - name: redhat family of OS related tasks
-      when: ansible_facts['os_family'] == 'RedHat'
-      import_tasks: tasks/redhat.yml
+    - name: Import specific OS-related tasks
+      include_tasks: "{{ lookup('first_found', __OS_distribution) }}"
+      vars:
+        __OS_distribution:
+          files:
+            - "tasks/{{ ansible_facts['distribution'] }}.yml"
+          paths:
+            - "{{ playbook_dir }}"
+          skip: true
 
-    - name: Ubuntu related tasks
-      when: ansible_facts['distribution'] == 'Ubuntu'
-      import_tasks: tasks/ubuntu.yml
-
-    - name: Debain related tasks
-      when: ansible_facts['distribution'] == 'Debian'
-      import_tasks: tasks/debian.yml
 
 - name: set insecure container registry in /etc/containers/registries.conf
   ansible.builtin.import_playbook: cephadm-set-container-insecure-registries.yml

diff --git a/tasks/Centos.yml b/tasks/Centos.yml
@@ -0,0 +1 @@
+Redhat.yml
diff --git a/tasks/debian.yml → tasks/Debian.yml b/tasks/debian.yml → tasks/Debian.yml
diff --git a/tasks/redhat.yml → tasks/Redhat.yml b/tasks/redhat.yml → tasks/Redhat.yml
diff --git a/tasks/ubuntu.yml → tasks/Ubuntu.yml b/tasks/ubuntu.yml → tasks/Ubuntu.yml