Add two missing lines for Hdfs 3.3.6

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:

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:

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

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/'

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:

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 }}"

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: >
@@ -112,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
 

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_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
 

roles/hdfs_upgrade/defaults/main.yml

@@ -18,14 +18,14 @@ 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/'
 
 # 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/'

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
 

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: