fixed ood install with disbaled repos + fixed ark CRB typo

Author: wtripp180901

ansible/fatimage.yml

@@ -69,10 +69,6 @@
         tasks_from: install.yml
       when: "'openhpc' in group_names"
 
-    - name: Install Apache PAM module # Extracted from start of roles/openondemand/tasks/pam_auth.yml to ensure only installed during build
-      yum:
-        name: mod_authnz_pam
-
     # - import_playbook: portal.yml
     - name: Open Ondemand server (packages)
       include_role:
@@ -102,6 +98,10 @@
         tasks_from: jupyter_compute.yml
       when: "'openondemand_jupyter' in group_names"
 
+    - name: Install Apache PAM module # Extracted from start of roles/openondemand/tasks/pam_auth.yml to ensure only installed during build
+      yum:
+        name: mod_authnz_pam
+
     # - import_playbook: monitoring.yml:
     - import_role:
         name: opensearch

ansible/roles/dnf_repos/defaults/main.yml

@@ -16,7 +16,7 @@ dnf_repos_repolist:
   base_url: "{{ dnf_repos_rocky_ark_prefix }}/AppStream/{{ dnf_repos_rocky_ark_suffix }}"
 - file: rocky
   name: crb
-  base_url: "{{ dnf_repos_rocky_ark_prefix }}/AppStream/{{ dnf_repos_rocky_ark_suffix }}"
+  base_url: "{{ dnf_repos_rocky_ark_prefix }}/CRB/{{ dnf_repos_rocky_ark_suffix }}"
 - file: rocky-extras
   name: extras
   base_url: "{{ dnf_repos_rocky_ark_prefix }}/extras/{{ dnf_repos_rocky_ark_suffix }}"

ansible/roles/openondemand/tasks/main.yml

@@ -6,12 +6,18 @@
   loop: "{{ openondemand_osc_ood_defaults | dict2items }}"
   when: (item.key in hostvars[inventory_hostname]) or (item.value)
 
+# osc.ood variables are exposed to play here instead of setting 'public' in include role so that they will still be exposed during runtime
+- ansible.builtin.include_vars:
+    dir: "{{ playbook_dir }}/roles/osc.ood/defaults/main"
+
+- ansible.builtin.include_vars:
+    file: "{{ playbook_dir }}/roles/osc.ood/vars/Rocky/{{ ansible_distribution_major_version }}.yml"
+
 # if using PAM auth we need apache installed but NOT started so split the osc.ood role up:
 - include_role:
     name: osc.ood
     tasks_from: install-package.yml
     vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml"
-    public: yes # Expose the vars from this role to the rest of the play
   when: appliances_mode != 'configure'
   # can't set vars: from a dict hence the workaround above
 

ansible/roles/openondemand/tasks/pam_auth.yml

@@ -1,5 +1,8 @@
 # https://osc.github.io/ood-documentation/latest/authentication/pam.html
 ---
+- name: Install Apache PAM module # Extracted from start of roles/openondemand/tasks/pam_auth.yml to ensure only installed during build
+  yum:
+    name: mod_authnz_pam
 
 - name: Enable Apache PAM module
   lineinfile:

ansible/roles/openondemand/tasks/vnc_compute.yml

@@ -48,6 +48,7 @@
   tags: install
   yum:
     name: '@Xfce'
+  when: appliances_mode != 'configure' # dnf group/module installs aren't idempotent so only run during build
 
 # - name: Ensure python3.9 installed
 #   dnf: