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

Fix RL8.6 and EPEL repo changes
stackhpc · Jan 10, 2023 · 6d11e4c · 6d11e4c
2 parents 230ff80 + 6c75d98
commit 6d11e4c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
@@ -44,11 +44,6 @@
       become: true
     - name: Reset ssh connection to allow user changes to affect ansible_user
       meta: reset_connection
-    - name: Set dnf releasever
-      ansible.builtin.copy:
-        dest: /etc/yum/vars/releasever
-        content: "{{ releasever }}"
-      become: true
 
 - hosts: systemd
   become: yes

diff --git a/environments/arcus/builder.pkrvars.hcl b/environments/arcus/builder.pkrvars.hcl
@@ -1,6 +1,7 @@
 flavor = "vm.alaska.cpu.general.small"
 networks = ["a262aabd-e6bf-4440-a155-13dbc1b5db0e"] # WCDC-iLab-60
-source_image_name = "openhpc-221118-1422.qcow2"
+source_image_name = "openhpc-230106-1107.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/13
+#source_image_name = "Rocky-8-GenericCloud-Base-8.7-20221130.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 security_groups = ["default", "SSH"]
 ssh_bastion_host = "128.232.222.183"

diff --git a/environments/arcus/inventory/group_vars/all/cloud_init.yml b/environments/arcus/inventory/group_vars/all/cloud_init.yml
diff --git a/environments/arcus/terraform/main.tf b/environments/arcus/terraform/main.tf
@@ -17,7 +17,9 @@ variable "create_nodes" {
 variable "cluster_image" {
     description = "single image for all cluster nodes - a convenience for CI"
     type = string
-    default = "openhpc-221118-1422.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/12
+    default = "openhpc-230106-1107.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/13
+    # default = "Rocky-8-GenericCloud-Base-8.7-20221130.0.x86_64.qcow2"
+    # default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
 }
 
 module "cluster" {

diff --git a/environments/common/inventory/group_vars/all/update.yml b/environments/common/inventory/group_vars/all/update.yml
@@ -6,6 +6,7 @@ update_name: '*'
 update_state: latest
 update_exclude:
   - grafana
+  - apptainer # see https://github.com/stackhpc/ansible-slurm-appliance/pull/245
 update_disablerepo: omit
 # Log changes during update here on localhost:
 update_log_path:  "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/logs/{{ inventory_hostname }}-updates.log"
diff --git a/requirements.yml b/requirements.yml
@@ -3,7 +3,7 @@ roles:
   - src: stackhpc.nfs
     version: v22.9.1
   - src: https://github.com/stackhpc/ansible-role-openhpc.git
-    version: v0.16.0
+    version: v0.17.0 # workaround for elrepo apptainer changes
     name: stackhpc.openhpc
   - src: https://github.com/stackhpc/ansible-node-exporter.git
     version: feature/no-install