Skip to content

Fix RL8.6 and EPEL repo changes #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 10, 2023
Merged

Fix RL8.6 and EPEL repo changes #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
707d531
use RL8.7 'fat' image with no releasever pinning + workaround for sin…
sjpb Jan 4, 2023
1a228c6
remove releasever pinning
sjpb Jan 4, 2023
7115b78
workaround for ohpc-base-compute package dependency on singularity
sjpb Jan 4, 2023
6dd0a8a
remove nonexisting cloud_init groupvar symlink
sjpb Jan 4, 2023
825dcff
Revert "workaround for ohpc-base-compute package dependency on singul…
sjpb Jan 5, 2023
7846080
use openhpc role with workaround for ohpc-base-compute singularity issue
sjpb Jan 5, 2023
6c8d3c7
exclude apptainer from updates to avoid breaking fix for ohpc-base-co…
sjpb Jan 5, 2023
dde9b10
update arcus with fixed image from RL8.6/elrepo/ohpc-base-compute PR,…
sjpb Jan 5, 2023
6c75d98
use fat image from slurm_image_builder PR13 based on RL8.6+updates to…
sjpb Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ansible/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion environments/arcus/builder.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While this is a fine workaround for now, we should probably put some time into working out how to build from Rocky GenericCloud images again when we have the capacity.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can built from GenericCloud 8.6 images, that is what the "fat" image openhpc-221118-1422.qcow2 is based on (the link to the fat image PR is the other change in the TF). We just can't build from 8.7 images cause they appear to be broken.

ssh_keypair_name = "slurm-app-ci"
security_groups = ["default", "SSH"]
ssh_bastion_host = "128.232.222.183"
Expand Down
1 change: 0 additions & 1 deletion environments/arcus/inventory/group_vars/all/cloud_init.yml
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion environments/arcus/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
1 change: 1 addition & 0 deletions environments/common/inventory/group_vars/all/update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down