Merge pull request #13 from stackhpc/fix/ohpc-base-compute

Fix RL8.6 and EPEL repo changes

Author: sjpb

.github/workflows/arcus.yml

@@ -41,7 +41,7 @@ jobs:
         id: image_build
         run: |
           . venv/bin/activate
-          PACKER_LOG=1 packer build --on-error=ask -var-file=arcus.builder.pkrvars.hcl openstack.pkr.hcl
+          PACKER_LOG=1 packer build --on-error=ask openstack.pkr.hcl
         env:
           OS_CLOUD: openstack
 

README.md

@@ -21,7 +21,7 @@ Current manual steps, assuming a Rocky Linux 8.5 host on Arcus:
 1. Clone the repo
 1. Install environment: `./setup.sh`
 1. Activate venv if necessary: `. venv/bin/activate`
-1. Build image: `PACKER_LOG=1 packer build --on-error=ask -var-file=arcus.builder.pkrvars.hcl openstack.pkr.hcl`
+1. Build image: `PACKER_LOG=1 packer build --on-error=ask openstack.pkr.hcl`
 
 # Usage of Images
 

arcus.builder.pkrvars.hcl

@@ -12,7 +12,7 @@ node_exporter_version: 1.1.2
 _node_exporter_binary_install_dir: "/usr/local/bin"
 
 # https://github.com/cloudalchemy/ansible-grafana/blob/master/defaults/main.yml
-grafana_version: 9.0.3
+grafana_version: '8.5.9'
 
 # https://github.com/cloudalchemy/ansible-grafana/blob/master/vars/redhat.yml
 grafana_package: "grafana{{ (grafana_version != 'latest') | ternary('-' ~ grafana_version, '') }}"

roles/builder/defaults/main/cloudalchemy.yml

@@ -1,5 +1,3 @@
-releasever: '8.6'
-
 rpm_keys:
   - https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand # https://github.com/OSC/ood-ansible/blob/master/defaults/main/install.yml: rpm_repo_key
 
@@ -15,6 +13,9 @@ dnf_release_packages: # list of ansible.builtin.dnf args for packages to install
     disable_gpg_check: yes
   - name: https://yum.osc.edu/ondemand/2.0/ondemand-release-web-2.0-1.noarch.rpm # https://github.com/OSC/ood-ansible/blob/master/defaults/main/install.yml:rpm_repo_url
     disable_gpg_check: yes
+  # workaround https://github.com/openhpc/ohpc/issues/1644:
+  - name: https://github.com/apptainer/apptainer/releases/download/v1.1.3/apptainer-1.1.3-1.x86_64.rpm
+    disable_gpg_check: yes
 
 dnf_repofiles_no_minor_releasever: # list of repofiles which can't cope with an X.Y releasever
   - /etc/yum.repos.d/ondemand-web.repo

roles/builder/defaults/main/dnf_packages.yml

@@ -4,14 +4,6 @@
   dnf: "{{ item }}"
   loop: "{{ dnf_release_packages }}"
 
-- name: Remove minor releasever from repofiles
-  ansible.builtin.replace:
-    path: "{{ item }}"
-    regexp: '\$releasever'
-    replace: "{{ releasever | split('.') | first }}"
-  when: "'.' in releasever"
-  loop: "{{ dnf_repofiles_no_minor_releasever }}"
-
 - name: Install latest dnf packages
   dnf:
     name: "{{ dnf_latest_packages }}"

roles/builder/tasks/dnf_packages.yml

@@ -15,11 +15,6 @@
     policy: "{{ selinux_policy }}"
   register: sestatus
 
-- name: Set releasever
-  ansible.builtin.copy:
-    dest: /etc/yum/vars/releasever
-    content: "{{ releasever }}"
-
 - name: Upgrade base image packages
   dnf:
     name: '*'