seapath · insatomcat · Jul 4, 2026
diff --git a/playbooks/cluster_setup_cephadm.yaml b/playbooks/cluster_setup_cephadm.yaml
@@ -12,8 +12,6 @@
     - name: Detect SEAPATH distribution
       ansible.builtin.include_role:
         name: detect_seapath_distro
-    - name: Load cephadm_install distribution-specific variables
-      ansible.builtin.include_vars: "../vars/{{ seapath_distro }}_cephadm_install.yml"
     - name: Install cephadm prerequisites
       ansible.builtin.include_role:
         name: cephadm_install

diff --git a/roles/cephadm_install/tasks/main.yml b/roles/cephadm_install/tasks/main.yml
@@ -3,6 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ---
+- name: Load distribution-specific variables
+  ansible.builtin.include_vars: "{{ seapath_distro }}.yml"
+
 - name: Ensure group "cephadm" exists
   ansible.builtin.group:
     name: cephadm

diff --git a/vars/CentOS_cephadm_install.yml → roles/cephadm_install/vars/CentOS.yml b/vars/CentOS_cephadm_install.yml → roles/cephadm_install/vars/CentOS.yml
diff --git a/vars/Debian_cephadm_install.yml → roles/cephadm_install/vars/Debian.yml b/vars/Debian_cephadm_install.yml → roles/cephadm_install/vars/Debian.yml
diff --git a/vars/OracleLinux_cephadm_install.yml → roles/cephadm_install/vars/OracleLinux.yml b/vars/OracleLinux_cephadm_install.yml → roles/cephadm_install/vars/OracleLinux.yml
diff --git a/vars/SLES_cephadm_install.yml → roles/cephadm_install/vars/SLES.yml b/vars/SLES_cephadm_install.yml → roles/cephadm_install/vars/SLES.yml
diff --git a/vars/Yocto_cephadm_install.yml → roles/cephadm_install/vars/Yocto.yml b/vars/Yocto_cephadm_install.yml → roles/cephadm_install/vars/Yocto.yml