From d9fd5da8442ca4d07307cbb29be26be766583db9 Mon Sep 17 00:00:00 2001 From: sujeet Date: Fri, 7 Feb 2025 16:05:39 +0100 Subject: [PATCH] ubuntu24 support code Signed-off-by: sujeet --- roles/fal_install/tasks/install_local_pkg.yml | 5 +++ .../fal_install/tasks/install_remote_pkg.yml | 5 +++ roles/fal_upgrade/tasks/install_local_pkg.yml | 5 +++ .../fal_upgrade/tasks/install_remote_pkg.yml | 5 +++ roles/nfs_install/tasks/install_local_pkg.yml | 22 +++++++++++- .../nfs_install/tasks/install_remote_pkg.yml | 22 +++++++++++- .../nfs_install/tasks/install_repository.yml | 12 ++++++- roles/nfs_upgrade/tasks/install_local_pkg.yml | 19 ++++++++++ .../nfs_upgrade/tasks/install_remote_pkg.yml | 35 +++++++++++++++++++ .../nfs_upgrade/tasks/install_repository.yml | 12 ++++++- .../tasks/install_local_pkg.yml | 6 ++++ .../tasks/install_remote_pkg.yml | 6 ++++ .../tasks/install_local_pkg.yml | 10 ++++++ .../tasks/install_remote_pkg.yml | 10 ++++++ roles/smb_install/tasks/install_local_pkg.yml | 5 +++ .../smb_install/tasks/install_remote_pkg.yml | 5 +++ roles/smb_upgrade/tasks/install_local_pkg.yml | 10 ++++++ .../smb_upgrade/tasks/install_remote_pkg.yml | 10 ++++++ 18 files changed, 200 insertions(+), 4 deletions(-) diff --git a/roles/fal_install/tasks/install_local_pkg.yml b/roles/fal_install/tasks/install_local_pkg.yml index d83c841f..7f75cb08 100644 --- a/roles/fal_install/tasks/install_local_pkg.yml +++ b/roles/fal_install/tasks/install_local_pkg.yml @@ -128,6 +128,11 @@ set_fact: scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: install | file audit logging path + set_fact: + scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' #todo wrong - name: install | file audit logging path set_fact: diff --git a/roles/fal_install/tasks/install_remote_pkg.yml b/roles/fal_install/tasks/install_remote_pkg.yml index 1996c3ec..5928dafe 100644 --- a/roles/fal_install/tasks/install_remote_pkg.yml +++ b/roles/fal_install/tasks/install_remote_pkg.yml @@ -117,6 +117,11 @@ scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' +- name: install | file audit logging path + set_fact: + scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: install | file audit logging path set_fact: scale_fal_url: 'gpfs_rpms/rhel/' diff --git a/roles/fal_upgrade/tasks/install_local_pkg.yml b/roles/fal_upgrade/tasks/install_local_pkg.yml index 99d3e904..5bbdb80e 100644 --- a/roles/fal_upgrade/tasks/install_local_pkg.yml +++ b/roles/fal_upgrade/tasks/install_local_pkg.yml @@ -118,6 +118,11 @@ set_fact: scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | file audit logging path + set_fact: + scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' #todo wrong - name: upgrade | file audit logging path set_fact: diff --git a/roles/fal_upgrade/tasks/install_remote_pkg.yml b/roles/fal_upgrade/tasks/install_remote_pkg.yml index 31b0c0c7..e429fda6 100644 --- a/roles/fal_upgrade/tasks/install_remote_pkg.yml +++ b/roles/fal_upgrade/tasks/install_remote_pkg.yml @@ -107,6 +107,11 @@ scale_fal_url: 'gpfs_debs/ubuntu/ubuntu22/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' +- name: upgrade | file audit logging path + set_fact: + scale_fal_url: 'gpfs_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | file audit logging path set_fact: scale_fal_url: 'gpfs_rpms/rhel/' diff --git a/roles/nfs_install/tasks/install_local_pkg.yml b/roles/nfs_install/tasks/install_local_pkg.yml index 8a0236da..e5aafe97 100644 --- a/roles/nfs_install/tasks/install_local_pkg.yml +++ b/roles/nfs_install/tasks/install_local_pkg.yml @@ -165,7 +165,17 @@ - name: install | zimon path set_fact: scale_zimon_url: 'zimon_debs/ubuntu/' - when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' - name: install | smb path set_fact: @@ -193,6 +203,11 @@ scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + - name: install | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' + - name: install | nfs path set_fact: scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/' @@ -202,6 +217,11 @@ set_fact: scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + + - name: install | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' when: - ansible_distribution in scale_ubuntu_distribution - scale_version >= "5.1.4.0" diff --git a/roles/nfs_install/tasks/install_remote_pkg.yml b/roles/nfs_install/tasks/install_remote_pkg.yml index cb929943..7d729b56 100644 --- a/roles/nfs_install/tasks/install_remote_pkg.yml +++ b/roles/nfs_install/tasks/install_remote_pkg.yml @@ -139,7 +139,17 @@ - name: install | zimon path set_fact: scale_zimon_url: 'zimon_debs/ubuntu/' - when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' - name: install | smb path set_fact: @@ -167,6 +177,11 @@ scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + - name: install | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' + - name: install | nfs path set_fact: scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu20/' @@ -176,6 +191,11 @@ set_fact: scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + + - name: install | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' when: - ansible_distribution in scale_ubuntu_distribution - scale_version >= "5.1.4.0" diff --git a/roles/nfs_install/tasks/install_repository.yml b/roles/nfs_install/tasks/install_repository.yml index a0fa71c3..c619e014 100644 --- a/roles/nfs_install/tasks/install_repository.yml +++ b/roles/nfs_install/tasks/install_repository.yml @@ -116,7 +116,17 @@ - name: install | zimon path set_fact: scale_zimon_url: 'zimon_debs/ubuntu/' - when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' - name: install|configure nfs YUM repository yum_repository: diff --git a/roles/nfs_upgrade/tasks/install_local_pkg.yml b/roles/nfs_upgrade/tasks/install_local_pkg.yml index d095eb26..41c54994 100644 --- a/roles/nfs_upgrade/tasks/install_local_pkg.yml +++ b/roles/nfs_upgrade/tasks/install_local_pkg.yml @@ -118,6 +118,16 @@ scale_nfs_url: 'ganesha_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | nfs path set_fact: scale_nfs_url: 'ganesha_rpms/sles12/' @@ -158,6 +168,15 @@ scale_zimon_url: 'zimon_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' # Find nfs rpms diff --git a/roles/nfs_upgrade/tasks/install_remote_pkg.yml b/roles/nfs_upgrade/tasks/install_remote_pkg.yml index b96c0651..a4868f3d 100644 --- a/roles/nfs_upgrade/tasks/install_remote_pkg.yml +++ b/roles/nfs_upgrade/tasks/install_remote_pkg.yml @@ -91,6 +91,16 @@ scale_nfs_url: 'ganesha_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | nfs path + set_fact: + scale_nfs_url: 'ganesha_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | nfs path set_fact: scale_nfs_url: 'ganesha_rpms/sles12/' @@ -131,6 +141,21 @@ scale_zimon_url: 'zimon_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | smb path set_fact: scale_smb_url: 'smb_debs/ubuntu/ubuntu16/' @@ -146,6 +171,16 @@ scale_smb_url: 'smb_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - block: ## when: host is defined as a protocol node - name: upgrade | Find gpfs.smb (gpfs.smb) package diff --git a/roles/nfs_upgrade/tasks/install_repository.yml b/roles/nfs_upgrade/tasks/install_repository.yml index a08d6532..5376ca33 100644 --- a/roles/nfs_upgrade/tasks/install_repository.yml +++ b/roles/nfs_upgrade/tasks/install_repository.yml @@ -62,7 +62,17 @@ - name: upgrade | zimon path set_fact: scale_zimon_url: 'zimon_debs/ubuntu/' - when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version >= '20' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' - block: - name: upgrade | nfs path diff --git a/roles/perfmon_install/tasks/install_local_pkg.yml b/roles/perfmon_install/tasks/install_local_pkg.yml index ba944101..c18c2066 100644 --- a/roles/perfmon_install/tasks/install_local_pkg.yml +++ b/roles/perfmon_install/tasks/install_local_pkg.yml @@ -154,6 +154,12 @@ when: - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: + - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: install | zimon path set_fact: scale_zimon_url: 'zimon_rpms/sles12/' diff --git a/roles/perfmon_install/tasks/install_remote_pkg.yml b/roles/perfmon_install/tasks/install_remote_pkg.yml index b1881d17..7dde421f 100644 --- a/roles/perfmon_install/tasks/install_remote_pkg.yml +++ b/roles/perfmon_install/tasks/install_remote_pkg.yml @@ -128,6 +128,12 @@ when: - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' +- name: install | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: + - ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: install | zimon path set_fact: scale_zimon_url: 'zimon_rpms/sles12/' diff --git a/roles/perfmon_upgrade/tasks/install_local_pkg.yml b/roles/perfmon_upgrade/tasks/install_local_pkg.yml index 6879b622..b4ec6643 100644 --- a/roles/perfmon_upgrade/tasks/install_local_pkg.yml +++ b/roles/perfmon_upgrade/tasks/install_local_pkg.yml @@ -136,6 +136,16 @@ scale_zimon_url: 'zimon_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | zimon path set_fact: scale_zimon_url: 'zimon_rpms/sles12/' diff --git a/roles/perfmon_upgrade/tasks/install_remote_pkg.yml b/roles/perfmon_upgrade/tasks/install_remote_pkg.yml index 7149617a..c2d89e88 100644 --- a/roles/perfmon_upgrade/tasks/install_remote_pkg.yml +++ b/roles/perfmon_upgrade/tasks/install_remote_pkg.yml @@ -110,6 +110,16 @@ scale_zimon_url: 'zimon_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | zimon path + set_fact: + scale_zimon_url: 'zimon_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - name: upgrade | zimon path set_fact: scale_zimon_url: 'zimon_rpms/sles12/' diff --git a/roles/smb_install/tasks/install_local_pkg.yml b/roles/smb_install/tasks/install_local_pkg.yml index 06912cdd..0f17fbb2 100644 --- a/roles/smb_install/tasks/install_local_pkg.yml +++ b/roles/smb_install/tasks/install_local_pkg.yml @@ -148,6 +148,11 @@ set_fact: scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + + - name: install | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' when: - ansible_distribution in scale_ubuntu_distribution - scale_version >= "5.1.4.0" diff --git a/roles/smb_install/tasks/install_remote_pkg.yml b/roles/smb_install/tasks/install_remote_pkg.yml index 67cc2e4a..565251f1 100644 --- a/roles/smb_install/tasks/install_remote_pkg.yml +++ b/roles/smb_install/tasks/install_remote_pkg.yml @@ -121,6 +121,11 @@ set_fact: scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' when: ansible_distribution_major_version == '22' + + - name: install | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution_major_version == '24' when: - ansible_distribution in scale_ubuntu_distribution - scale_version >= "5.1.4.0" diff --git a/roles/smb_upgrade/tasks/install_local_pkg.yml b/roles/smb_upgrade/tasks/install_local_pkg.yml index ccb69e82..947ba27f 100644 --- a/roles/smb_upgrade/tasks/install_local_pkg.yml +++ b/roles/smb_upgrade/tasks/install_local_pkg.yml @@ -141,6 +141,16 @@ scale_smb_url: 'smb_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + # Find smb rpms diff --git a/roles/smb_upgrade/tasks/install_remote_pkg.yml b/roles/smb_upgrade/tasks/install_remote_pkg.yml index 10c8fdc1..a9d78070 100644 --- a/roles/smb_upgrade/tasks/install_remote_pkg.yml +++ b/roles/smb_upgrade/tasks/install_remote_pkg.yml @@ -101,6 +101,16 @@ scale_smb_url: 'smb_debs/ubuntu/' when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '20' +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu22/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '22' + +- name: upgrade | smb path + set_fact: + scale_smb_url: 'smb_debs/ubuntu/ubuntu24/' + when: ansible_distribution in scale_ubuntu_distribution and ansible_distribution_major_version == '24' + - block: ## when: host is defined as a protocol node - name: upgrade | Find gpfs.smb (gpfs.smb) package