From e451c8a4d23b6624797db806b02fba077478b1bb Mon Sep 17 00:00:00 2001 From: sujeet Date: Wed, 8 Jan 2025 18:02:38 +0100 Subject: [PATCH 1/5] Fixed callhome defect fixes Signed-off-by: sujeet --- roles/callhome_configure/tasks/configure.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/callhome_configure/tasks/configure.yml b/roles/callhome_configure/tasks/configure.yml index 14274003..c87df6f1 100755 --- a/roles/callhome_configure/tasks/configure.yml +++ b/roles/callhome_configure/tasks/configure.yml @@ -54,7 +54,7 @@ - name: configure| Setup the call home customer configuration shell: - cmd: "{{ scale_command_path }}mmcallhome info change --customer-name {{ scale_callhome_params.customer_name }} --customer-id {{ scale_callhome_params.customer_id }} --email {{ scale_callhome_params.customer_email}} --country-code {{ scale_callhome_params.customer_country }}" + cmd: "{{ scale_command_path }}mmcallhome info change --customer-name \"{{ scale_callhome_params.customer_name }}\" --customer-id {{ scale_callhome_params.customer_id }} --email {{ scale_callhome_params.customer_email}} --country-code {{ scale_callhome_params.customer_country }}" register: scale_callhome_customer_config - debug: From c40c2bebe2d6d327e669e3acc6ac6682ef23f240 Mon Sep 17 00:00:00 2001 From: sujeet Date: Mon, 20 Jan 2025 06:56:12 +0100 Subject: [PATCH 2/5] README file update for CES S3 and supported OS Signed-off-by: sujeet --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b37d74d8..7f157e72 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,9 @@ Features - [x] Support for RHEL 7 on x86_64, PPC64 and PPC64LE - [x] Support for RHEL 8 on x86_64 and PPC64LE +- [x] Support for RHEL 9 on x86_64 and PPC64LE - [x] Support for UBUNTU 20 on x86_64 and PPC64LE +- [x] Support for UBUNTU 22 on x86_64 and PPC64LE - [x] Support for SLES 15 on x86_64 and PPC64LE #### Common prerequisites @@ -91,6 +93,7 @@ Features - [x] Install IBM Storage Scale SMB or NFS on selected cluster nodes (5.0.5.2 and above) - [x] Install IBM Storage Scale Object on selected cluster nodes (5.1.1.0 and above) +- [x] Install IBM Storage Scale S3 on selected cluster nodes (5.2.0.0 and above) - [x] CES IPV4 or IPV6 support - [x] CES interface mode support @@ -107,12 +110,14 @@ The following IBM Storage Scale versions are tested: - 5.0.4.0 and above - 5.0.5.2 and above for CES (SMB and NFS) - 5.1.1.0 and above for CES (Object) +- 5.2.0.0 and above for CES (S3) - **Refer to the [Release Notes](https://github.com/IBM/ibm-spectrum-scale-install-infra/releases) for details** Specific OS requirements: - For CES (SMB/NFS) on SLES15: Python 3 is required. - For CES (Object): RhedHat 8.x is required. +- For CES (S3): RhedHat 8.x or RhedHat 9.x is required. Prerequisites ------------- @@ -308,6 +313,7 @@ The following [roles](https://docs.ansible.com/ansible/latest/user_guide/playboo - HDFS (`roles/hdfs_*`) - Call Home (`roles/callhome_*`) - File Audit Logging (`roles/fal_*`) +- S3 (`roles/s3_*`) - ... Note that [Core GPFS](roles/core) is the only mandatory role, all other roles are optional. Each of the optional roles requires additional configuration variables. Browse the examples in the [samples/](samples/) directory to learn how to: From aab57f04bc303b3d093e38f2f559a64c3e79872b Mon Sep 17 00:00:00 2001 From: Rajan Mishra Date: Wed, 29 Jan 2025 19:05:47 +0100 Subject: [PATCH 3/5] Fixed node add package install issue Signed-off-by: Rajan Mishra --- roles/core_install/tasks/yum/install.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/roles/core_install/tasks/yum/install.yml b/roles/core_install/tasks/yum/install.yml index 2d32e6ba..ec73f695 100644 --- a/roles/core_install/tasks/yum/install.yml +++ b/roles/core_install/tasks/yum/install.yml @@ -51,3 +51,23 @@ - (scale_install_packageresult.changed) or (scale_install_dnfpackageresult.changed) when: ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf' when: not scale_daemon_running + +- block: + - name: install | Get scaleapi package + command: rpm -qi gpfs.scaleapi + register: package_name_scaleapi + ignore_errors: true + failed_when: false + when: + - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf' + + - name: install | Install GPFS scaleapi package + dnf: + name: "gpfs.scaleapi" + state: present + ignore_errors: true + failed_when: false + when: + - package_name_scaleapi.rc is defined + - package_name_scaleapi.rc != 0 + when: scale_scaleadmd is defined From 626b224ead21b7da5154468c223e7ebdbd1f915c Mon Sep 17 00:00:00 2001 From: Christoph Keil Date: Thu, 6 Feb 2025 14:37:18 +0100 Subject: [PATCH 4/5] Adding code for hdfs 3.3.6 Signed-off-by: Christoph Keil --- roles/hdfs_install/defaults/main.yml | 4 ++-- roles/hdfs_install/tasks/install.yml | 4 ++-- roles/hdfs_prepare/tasks/check.yml | 2 +- roles/hdfs_prepare/tasks/java_home.yml | 1 + roles/hdfs_prepare/tasks/prepare_env.yml | 14 +++++++------- roles/hdfs_upgrade/defaults/main.yml | 6 +++--- roles/hdfs_upgrade/tasks/prepare_env.yml | 14 +++++++------- roles/hdfs_upgrade/tasks/upgrade.yml | 4 ++-- 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/roles/hdfs_install/defaults/main.yml b/roles/hdfs_install/defaults/main.yml index a7c01e37..2d6474e6 100644 --- a/roles/hdfs_install/defaults/main.yml +++ b/roles/hdfs_install/defaults/main.yml @@ -17,8 +17,8 @@ scale_hdfs_install_debuginfo: true # Directory to install 3.1.1.x hdfs package scale_hdfs_rhel_version_path: 'hdfs_rpms/rhel/hdfs_3.1.1.x/' -# Directory to install 3.3.x hdfs package -scale_hdfs_rhel_version_path_33: 'hdfs_rpms/rhel/hdfs_3.3.x/' +# Directory to install 3.3.6.x hdfs package +scale_hdfs_rhel_version_path_336: 'hdfs_rpms/rhel/hdfs_3.3.6.x/' # Directory to install 3.2.2.x hdfs package scale_hdfs_rhel_version_path_322: 'hdfs_rpms/rhel/hdfs_3.2.2.x/' diff --git a/roles/hdfs_install/tasks/install.yml b/roles/hdfs_install/tasks/install.yml index 88fa0cf6..3429fa19 100644 --- a/roles/hdfs_install/tasks/install.yml +++ b/roles/hdfs_install/tasks/install.yml @@ -92,8 +92,8 @@ - block: - name: install | Fetch hdfs version set_fact: - hdfs_version_path_selection_rhel: "{{ scale_hdfs_rhel_version_path_33 }}" - when: transparency_33_enabled|bool + hdfs_version_path_selection_rhel: "{{ scale_hdfs_rhel_version_path_336 }}" + when: transparency_336_enabled|bool - name: install | Fetch hdfs version set_fact: diff --git a/roles/hdfs_prepare/tasks/check.yml b/roles/hdfs_prepare/tasks/check.yml index 46d43177..0426d9b8 100644 --- a/roles/hdfs_prepare/tasks/check.yml +++ b/roles/hdfs_prepare/tasks/check.yml @@ -2,7 +2,7 @@ - include_tasks: prepare_env.yml - debug: - msg: "transparency_33_enabled: {{ transparency_33_enabled|bool }}" + msg: "transparency_336_enabled: {{ transparency_336_enabled|bool }}" - debug: msg: "transparency_322_enabled: {{ transparency_322_enabled|bool }}" diff --git a/roles/hdfs_prepare/tasks/java_home.yml b/roles/hdfs_prepare/tasks/java_home.yml index 5b8ac881..93b3e72c 100644 --- a/roles/hdfs_prepare/tasks/java_home.yml +++ b/roles/hdfs_prepare/tasks/java_home.yml @@ -104,6 +104,7 @@ when: - ansible_fqdn in scale_hdfs_nodes_list or inventory_hostname in scale_hdfs_nodes_list - transparency_322_enabled|bool == False + - transparency_336_enabled|bool == False - fail: msg: > diff --git a/roles/hdfs_prepare/tasks/prepare_env.yml b/roles/hdfs_prepare/tasks/prepare_env.yml index ff52a973..aeb3438a 100644 --- a/roles/hdfs_prepare/tasks/prepare_env.yml +++ b/roles/hdfs_prepare/tasks/prepare_env.yml @@ -1,14 +1,14 @@ --- - name: set_fact: - transparency_33_enabled: "False" + transparency_336_enabled: "False" transparency_322_enabled: "False" - transparency_version_33: "False" + transparency_version_336: "False" transparency_version_322: "False" - name: - shell: "echo $SCALE_HDFS_TRANSPARENCY_VERSION_33_ENABLE" - register: transparency_version_33 + shell: "echo $SCALE_HDFS_TRANSPARENCY_VERSION_336_ENABLE" + register: transparency_version_336 delegate_to: localhost run_once: true @@ -20,10 +20,10 @@ - name: set_fact: - transparency_33_enabled: "{{ transparency_version_33.stdout|bool }}" + transparency_336_enabled: "{{ transparency_version_33.stdout|bool }}" when: - - transparency_version_33.stdout is defined - - transparency_version_33.stdout|bool + - transparency_version_336.stdout is defined + - transparency_version_336.stdout|bool delegate_to: localhost run_once: true diff --git a/roles/hdfs_upgrade/defaults/main.yml b/roles/hdfs_upgrade/defaults/main.yml index 74bea331..8cb492f3 100644 --- a/roles/hdfs_upgrade/defaults/main.yml +++ b/roles/hdfs_upgrade/defaults/main.yml @@ -18,8 +18,8 @@ scale_hdfs_install_debuginfo: true # Directory to install 3.1.1.x hdfs package scale_hdfs_rhel_version_path: 'hdfs_rpms/rhel/hdfs_3.1.1.x/' -# Directory to install 3.3.x hdfs package -scale_hdfs_rhel_version_path_33: 'hdfs_rpms/rhel/hdfs_3.3.x/' +# Directory to install 3.3.6.x hdfs package +scale_hdfs_rhel_version_path_336: 'hdfs_rpms/rhel/hdfs_3.3.6.x/' # Directory to install 3.2.2.x hdfs package scale_hdfs_rhel_version_path_322: 'hdfs_rpms/rhel/hdfs_3.2.2.x/' @@ -27,5 +27,5 @@ scale_hdfs_rhel_version_path_322: 'hdfs_rpms/rhel/hdfs_3.2.2.x/' # Directory to install 3.1.1.x hdfs package scale_hdfs_sles_version_path: 'hdfs_rpms/rhel/hdfs_3.1.1.x/' -# Directory to install 3.3.x hdfs package +# Directory to install 3.1.1.x hdfs package scale_hdfs_ubuntu_version_path: 'hdfs_debs/ubuntu/hdfs_3.1.1.x/' diff --git a/roles/hdfs_upgrade/tasks/prepare_env.yml b/roles/hdfs_upgrade/tasks/prepare_env.yml index ff52a973..a42ed6af 100644 --- a/roles/hdfs_upgrade/tasks/prepare_env.yml +++ b/roles/hdfs_upgrade/tasks/prepare_env.yml @@ -1,14 +1,14 @@ --- - name: set_fact: - transparency_33_enabled: "False" + transparency_336_enabled: "False" transparency_322_enabled: "False" - transparency_version_33: "False" + transparency_version_336: "False" transparency_version_322: "False" - name: - shell: "echo $SCALE_HDFS_TRANSPARENCY_VERSION_33_ENABLE" - register: transparency_version_33 + shell: "echo $SCALE_HDFS_TRANSPARENCY_VERSION_336_ENABLE" + register: transparency_version_336 delegate_to: localhost run_once: true @@ -20,10 +20,10 @@ - name: set_fact: - transparency_33_enabled: "{{ transparency_version_33.stdout|bool }}" + transparency_336_enabled: "{{ transparency_version_336.stdout|bool }}" when: - - transparency_version_33.stdout is defined - - transparency_version_33.stdout|bool + - transparency_version_336.stdout is defined + - transparency_version_336.stdout|bool delegate_to: localhost run_once: true diff --git a/roles/hdfs_upgrade/tasks/upgrade.yml b/roles/hdfs_upgrade/tasks/upgrade.yml index 82008c5c..f305430b 100644 --- a/roles/hdfs_upgrade/tasks/upgrade.yml +++ b/roles/hdfs_upgrade/tasks/upgrade.yml @@ -63,8 +63,8 @@ - block: - name: set_fact: - hdfs_version_path_selection_rhel: "{{ scale_hdfs_rhel_version_path_33 }}" - when: transparency_33_enabled|bool + hdfs_version_path_selection_rhel: "{{ scale_hdfs_rhel_version_path_336 }}" + when: transparency_336_enabled|bool - name: set_fact: From 39ad78ee8742d02ee411df915c8d264f0cd47223 Mon Sep 17 00:00:00 2001 From: Christoph Keil Date: Wed, 12 Feb 2025 10:08:44 +0100 Subject: [PATCH 5/5] Add 2 missing lines for HDFS 3.3.6 Signed-off-by: Christoph Keil --- roles/hdfs_prepare/tasks/java_home.yml | 1 + roles/hdfs_prepare/tasks/prepare_env.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/hdfs_prepare/tasks/java_home.yml b/roles/hdfs_prepare/tasks/java_home.yml index 93b3e72c..c21da290 100644 --- a/roles/hdfs_prepare/tasks/java_home.yml +++ b/roles/hdfs_prepare/tasks/java_home.yml @@ -113,5 +113,6 @@ when: - ansible_fqdn in scale_hdfs_nodes_list or inventory_hostname in scale_hdfs_nodes_list - transparency_322_enabled|bool == False + - transparency_336_enabled|bool == False - dep_jars.rc != 0 diff --git a/roles/hdfs_prepare/tasks/prepare_env.yml b/roles/hdfs_prepare/tasks/prepare_env.yml index aeb3438a..a42ed6af 100644 --- a/roles/hdfs_prepare/tasks/prepare_env.yml +++ b/roles/hdfs_prepare/tasks/prepare_env.yml @@ -20,7 +20,7 @@ - name: set_fact: - transparency_336_enabled: "{{ transparency_version_33.stdout|bool }}" + transparency_336_enabled: "{{ transparency_version_336.stdout|bool }}" when: - transparency_version_336.stdout is defined - transparency_version_336.stdout|bool