From 6782308cdafd2129f5dc65637e5e4c72c1a6a3ed Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Mon, 6 Jan 2025 15:56:07 +0000 Subject: [PATCH 1/9] Release train support for ceph repos --- ansible/roles/dnf_repos/defaults/main.yml | 3 +++ ansible/roles/pulp_site/defaults/main.yml | 2 ++ environments/common/inventory/group_vars/all/defaults.yml | 7 +++++++ .../common/inventory/group_vars/all/os-manila-mount.yml | 1 + requirements.yml | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 environments/common/inventory/group_vars/all/os-manila-mount.yml diff --git a/ansible/roles/dnf_repos/defaults/main.yml b/ansible/roles/dnf_repos/defaults/main.yml index 17114b49d..52a91c803 100644 --- a/ansible/roles/dnf_repos/defaults/main.yml +++ b/ansible/roles/dnf_repos/defaults/main.yml @@ -30,6 +30,9 @@ dnf_repos_repolist: - file: "{{ dnf_repos_version_filenames.extras }}" name: extras base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}" +- file: ceph + name: Ceph + base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.ceph[ansible_distribution_major_version] | appliances_repo_to_subpath }}" dnf_repos_epel_baseurl: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.epel[ansible_distribution_major_version] | appliances_repo_to_subpath }}" dnf_repos_epel_description: "epel" diff --git a/ansible/roles/pulp_site/defaults/main.yml b/ansible/roles/pulp_site/defaults/main.yml index 081307b6a..a5b889b3c 100644 --- a/ansible/roles/pulp_site/defaults/main.yml +++ b/ansible/roles/pulp_site/defaults/main.yml @@ -22,6 +22,8 @@ pulp_site_rpm_info: subpath: "{{ appliances_pulp_repos.extras[pulp_site_target_distribution_version] | appliances_repo_to_subpath }}" - name: "epel-{{ pulp_site_target_distribution_version_major }}-{{ appliances_pulp_repos.epel[pulp_site_target_distribution_version_major].timestamp }}" subpath: "{{ appliances_pulp_repos.epel[pulp_site_target_distribution_version_major] | appliances_repo_to_subpath }}" +- name: "ceph-{{ pulp_site_target_distribution_version_major }}-{{ appliances_pulp_repos.ceph[pulp_site_target_distribution_version_major].timestamp }}" + subpath: "{{ appliances_pulp_repos.ceph[pulp_site_target_distribution_version_major] | appliances_repo_to_subpath }}" pulp_site_rpm_repo_defaults: remote_username: "{{ pulp_site_upstream_username }}" diff --git a/environments/common/inventory/group_vars/all/defaults.yml b/environments/common/inventory/group_vars/all/defaults.yml index f32d14c60..94b4367ff 100644 --- a/environments/common/inventory/group_vars/all/defaults.yml +++ b/environments/common/inventory/group_vars/all/defaults.yml @@ -151,3 +151,10 @@ appliances_pulp_repos: '8': timestamp: 20241216T235733 path: epel/8/Everything/x86_64 + ceph: + '8': + timestamp: 20231104T015751 + path: centos/8-stream/storage/x86_64/ceph-quincy + '9': + timestamp: 20241114T011240 + path: centos/9-stream/storage/x86_64/ceph-quincy diff --git a/environments/common/inventory/group_vars/all/os-manila-mount.yml b/environments/common/inventory/group_vars/all/os-manila-mount.yml new file mode 100644 index 000000000..9df62ea46 --- /dev/null +++ b/environments/common/inventory/group_vars/all/os-manila-mount.yml @@ -0,0 +1 @@ +os_manila_mount_ceph_rpm_repos: [] \ No newline at end of file diff --git a/requirements.yml b/requirements.yml index 7e71bb904..5eddb1acf 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: v24.11.0 # Support ceph quincy for RL9 + version: refactor/overridable-repos # TODO: change once merged collections: - name: containers.podman From 5f8346b3060e72047856bcb9b5e39c9afe7aa3d5 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:09:08 +0000 Subject: [PATCH 2/9] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index f9e568c3f..00a53feb3 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250102-1138-77cfc703", - "RL9": "openhpc-RL9-250102-1139-77cfc703" + "RL8": "openhpc-RL8-250106-1559-6782308c", + "RL9": "openhpc-RL9-250106-1559-6782308c" } } From 08a2a993794ee3525b788d3d0aa8ac9b337ef408 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:10:38 +0000 Subject: [PATCH 3/9] Update requirements.yml --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 5eddb1acf..27f4e49cf 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: refactor/overridable-repos # TODO: change once merged + version: v25.1.0 collections: - name: containers.podman From 0edc12b5b193e20f9e677d50f421e729ec175b56 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 7 Jan 2025 15:08:56 +0000 Subject: [PATCH 4/9] bumped rocky 9 ceph repos to reef --- environments/common/inventory/group_vars/all/defaults.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/common/inventory/group_vars/all/defaults.yml b/environments/common/inventory/group_vars/all/defaults.yml index 29f0372ce..e26bc3018 100644 --- a/environments/common/inventory/group_vars/all/defaults.yml +++ b/environments/common/inventory/group_vars/all/defaults.yml @@ -170,5 +170,5 @@ appliances_pulp_repos: timestamp: 20231104T015751 path: centos/8-stream/storage/x86_64/ceph-quincy '9': - timestamp: 20241114T011240 - path: centos/9-stream/storage/x86_64/ceph-quincy + timestamp: 20240923T233036 + path: centos/9-stream/storage/x86_64/ceph-reef From b03caaf358fd1e16cc600d4cd39725e00c753e3e Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 7 Jan 2025 15:32:01 +0000 Subject: [PATCH 5/9] updated rl9 ceph version number --- .../common/inventory/group_vars/all/os-manila-mount.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/environments/common/inventory/group_vars/all/os-manila-mount.yml b/environments/common/inventory/group_vars/all/os-manila-mount.yml index 9df62ea46..79a18028b 100644 --- a/environments/common/inventory/group_vars/all/os-manila-mount.yml +++ b/environments/common/inventory/group_vars/all/os-manila-mount.yml @@ -1 +1,5 @@ -os_manila_mount_ceph_rpm_repos: [] \ No newline at end of file +os_manila_mount_ceph_rpm_repos: [] +os_manila_mount_ceph_min_versions: + Rocky: + "8": '17.2.7' # quincy + "9": '18.2.4' # reef From 6165bbb203199cb3a0223193723ab25e052f25f6 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:13:26 +0000 Subject: [PATCH 6/9] bump images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 943a2dfbd..9c72b07ce 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250106-0916-f8603056", - "RL9": "openhpc-RL9-250106-0916-f8603056" + "RL8": "openhpc-RL8-250107-1534-b03caaf3", + "RL9": "openhpc-RL9-250107-1535-b03caaf3" } } From a800c9c3b2b6682efb907bee94d48360ca55cf07 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 7 Jan 2025 16:27:17 +0000 Subject: [PATCH 7/9] reverted to upstream ceph versions --- .../common/inventory/group_vars/all/os-manila-mount.yml | 4 ---- requirements.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/environments/common/inventory/group_vars/all/os-manila-mount.yml b/environments/common/inventory/group_vars/all/os-manila-mount.yml index 79a18028b..ec929b74c 100644 --- a/environments/common/inventory/group_vars/all/os-manila-mount.yml +++ b/environments/common/inventory/group_vars/all/os-manila-mount.yml @@ -1,5 +1 @@ os_manila_mount_ceph_rpm_repos: [] -os_manila_mount_ceph_min_versions: - Rocky: - "8": '17.2.7' # quincy - "9": '18.2.4' # reef diff --git a/requirements.yml b/requirements.yml index 27f4e49cf..f5d6a49ec 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: v25.1.0 + version: update/rl9-reef # todo: bump to release collections: - name: containers.podman From 0af4f9112ac0b0d1e53693556f0a57445f61e1b5 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 8 Jan 2025 09:45:46 +0000 Subject: [PATCH 8/9] Update requirements.yml --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index f5d6a49ec..71adbc6e5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -21,7 +21,7 @@ roles: version: v3.1.5 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount - version: update/rl9-reef # todo: bump to release + version: v25.1.1 collections: - name: containers.podman From a3aaa275c16118062fccedc28daec1c458847377 Mon Sep 17 00:00:00 2001 From: wtripp180901 <78219569+wtripp180901@users.noreply.github.com> Date: Wed, 8 Jan 2025 09:49:07 +0000 Subject: [PATCH 9/9] comment --- .../common/inventory/group_vars/all/os-manila-mount.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/common/inventory/group_vars/all/os-manila-mount.yml b/environments/common/inventory/group_vars/all/os-manila-mount.yml index ec929b74c..6b25d62cb 100644 --- a/environments/common/inventory/group_vars/all/os-manila-mount.yml +++ b/environments/common/inventory/group_vars/all/os-manila-mount.yml @@ -1 +1,3 @@ +# Empty repo lists from stackhpc.ansible-role-os-manila-mount role defaults, as these repofiles are +# now generated by dnf_repos to allow injecting Ark creds: os_manila_mount_ceph_rpm_repos: []