From a0899ef8caa3969b75828934d817e4bd2634b1f0 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 22 Jan 2025 11:44:23 +0000 Subject: [PATCH 1/2] fix squid/dnf ordering problem --- ansible/bootstrap.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index 88d9274b3..1d818b7cc 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -127,21 +127,35 @@ that: dnf_repos_password is undefined fail_msg: Passwords should not be templated into repofiles during configure, unset 'dnf_repos_password' when: appliances_mode == 'configure' - - name: Replace system repos with pulp repos - ansible.builtin.include_role: - name: dnf_repos - tasks_from: set_repos.yml -# --- tasks after here require access to package repos --- - hosts: squid tags: squid gather_facts: yes become: yes tasks: + # - Installing squid requires working dnf repos + # - Configuring dnf_repos itself requires working dnf repos to install epel + # - Hence do this on squid nodes first in case they are proxying others + - name: Replace system repos with pulp repos + ansible.builtin.include_role: + name: dnf_repos + tasks_from: set_repos.yml + when: "'dnf_repos' in group_names" - name: Configure squid proxy import_role: name: squid +- hosts: dnf_repos + tags: dnf_repos + gather_facts: yes + become: yes + tasks: + - name: Replace system repos with pulp repos + ansible.builtin.include_role: + name: dnf_repos + tasks_from: set_repos.yml + +# --- tasks after here require general access to package repos --- - hosts: tuned tags: tuned gather_facts: yes From 0af43126552484f74c8265b2558238fcccd00828 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 22 Jan 2025 12:18:22 +0000 Subject: [PATCH 2/2] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index de5e8e194..4f763d2e3 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250115-1510-99f67c6d", - "RL9": "openhpc-RL9-250115-1510-99f67c6d" + "RL8": "openhpc-RL8-250122-1150-a0899ef8", + "RL9": "openhpc-RL9-250122-1150-a0899ef8" } }