Fix DNF again

Author: assumptionsandg

etc/kayobe/dnf.yml

@@ -47,7 +47,7 @@ dnf_custom_repos: "{{ stackhpc_dnf_repos if stackhpc_repos_enabled | bool else [
 # To use these repos, set stackhpc_repos_enabled to true.
 # This is done by default for hosts in the overcloud group via a group_vars
 # file.
-stackhpc_dnf_repos: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool | combine(dnf_custom_repos_ofed if dnf_install_rocky_ofed) | bool else {}) }}"
+stackhpc_dnf_repos: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool else {}) | combine(dnf_custom_repos_ofed if dnf_install_rocky_ofed | bool else {}) }}"
 
 # OFED repository for Rocky 9
 dnf_custom_repos_ofed:
@@ -143,6 +143,9 @@ dnf_enable_epel: "{{ dnf_install_epel | bool }}"
 # Whether to enable the ELRepo repository. This affects RedHat-based, 9.x release systems only.
 dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
 
+# Whether to enable OFED repositories. This affects RedHat-based systems only.
+dnf_enable_rocky_ofed: "{{ dnf_install_rocky_ofed | bool }}"
+
 # URL of EPEL GPG keys.
 dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
 
@@ -163,9 +166,6 @@ dnf_enable_docker: true
 #URL of docker repo GPG key
 dnf_docker_gpg_key_url: "https://download.docker.com/linux/centos/gpg"
 
-# Whether to enable OFED repositories. This affects RedHat-based systems only.
-dnf_enable_rocky_ofed: false
-
 # Whether to create a repo file for OFED. This affects RedHat-based
 # systems only.
 dnf_install_rocky_ofed: false