From 4d3525c0f99a1675e334704296fc28126556b0e6 Mon Sep 17 00:00:00 2001 From: Asma Syed Hameed Date: Tue, 16 Dec 2025 13:32:57 +0530 Subject: [PATCH] Add configuration option to select a specific puddle --- ansible/group_vars/all.sample.yml | 7 +++++++ .../values-prep-dp/templates/edpm-nodeset-values.yml.j2 | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all.sample.yml b/ansible/group_vars/all.sample.yml index 11ee02f..f2d1e9d 100644 --- a/ansible/group_vars/all.sample.yml +++ b/ansible/group_vars/all.sample.yml @@ -3,6 +3,13 @@ lab: scalelab #scalelab/performancelab dt_path: /root/test/architecture compute_count: 1 +#rhos-release +rhos_release: 18.0 + +#update the required puddle +puddle: '' +rhel_release: 9.4 + # Baremetal node login and key details ssh_password: your-password ssh_username: cloud-admin diff --git a/ansible/roles/values-prep-dp/templates/edpm-nodeset-values.yml.j2 b/ansible/roles/values-prep-dp/templates/edpm-nodeset-values.yml.j2 index 0d9b344..0e4d81c 100644 --- a/ansible/roles/values-prep-dp/templates/edpm-nodeset-values.yml.j2 +++ b/ansible/roles/values-prep-dp/templates/edpm-nodeset-values.yml.j2 @@ -36,13 +36,16 @@ data: # install rhos-release repos dnf --nogpgcheck --repofrompath=rhos-release,http://download.devel.redhat.com/rcm-guest/puddles/OpenStack/rhos-release/ --repo=rhos-release install -y rhos-release + {%- if puddle != '' %} + rhos-release {{ rhos_release }} -p {{ puddle }} -r {{ rhel_release }} + {%- else %} rhos-release ceph-7.1-rhel-9 -r 9.4 + {%- endif %} # Issue #2 - edpm_bootstrap fails if we don't update 'container-selinux' dnf update -y rpm -ivh --nosignature http://download.devel.redhat.com/rcm-guest/puddles/OpenStack/rhos-release/rhos-release-latest.noarch.rpm - rhos-release ceph-7.1-rhel-9 -r 9.4 curl -o /etc/yum.repos.d/delorean.repo https://osp-trunk.hosted.upshift.rdu2.redhat.com/rhel9-osp18/current-podified/delorean.repo echo "[osptrunk-candidate-deps]" >> "/etc/yum.repos.d/osptrunk-candidate-deps.repo" echo "name=osptrunk-candidate-deps" >> "/etc/yum.repos.d/osptrunk-candidate-deps.repo"