Set Zimon path für Rhel10

roles/ces_common/tasks/check.yml

@@ -105,11 +105,13 @@ Please define the CES shared root file system mount point in the inventory."
      - scale_protocols.export_ip_pool is defined
      - scale_protocols.export_ip_pool|length > 0
      fail_msg: "CES export ip pool is not defined or empty"
+    when: scale_protocols.ces_existing is not defined
     run_once: true
 
   - name: check | Collect unique export ips
     set_fact:
      scale_export_ip: "{{ scale_protocols.export_ip_pool|unique }}"
+    when: scale_protocols.export_ip_pool is defined
     run_once: true
 
   - name: check | Check if export ips are duplicated
@@ -118,6 +120,7 @@ Please define the CES shared root file system mount point in the inventory."
      - scale_protocols.export_ip_pool|length == scale_export_ip|length
      fail_msg: "Duplicate ips found in export ip pool"
     run_once: true
+    when: scale_protocols.export_ip_pool is defined
   when: scale_protocols.scale_ces_groups is not defined
 
 - name: check | Get list of GPFS nodes which are not reporting active state
@@ -211,4 +214,6 @@ Please define the CES shared root file system mount point in the inventory."
     when: scale_ces_ipv4_list|length >0 and scale_ces_ipv6_list|length > 0
     failed_when: scale_ces_ipv4_list|length >0 and scale_ces_ipv6_list|length > 0
 
-  when: scale_protocols.scale_ces_groups is not defined
+  when: 
+    - scale_protocols.scale_ces_groups is not defined
+    - scale_protocols.export_ip_pool is defined

roles/ces_common/tasks/configure.yml

@@ -262,12 +262,16 @@
      scale_export_ips: "{{ scale_export_ips + ',' + item|string }}"
     with_items:
     - "{{ scale_protocols.export_ip_pool }}"
+    when:
+       - scale_protocols.export_ip_pool is defined
     delegate_to: "{{ scale_protocol_node_list.0 }}"
     run_once: true
 
   - name: configure | Assign export ips as pool
     command: "{{ scale_command_path }}mmces address add --ces-ip {{ scale_export_ips[1:] }}"
-    when: scale_protocols.scale_ces_groups is not defined
+    when: 
+      - scale_protocols.scale_ces_groups is not defined
+      - scale_protocols.export_ip_pool is defined
     delegate_to: "{{ scale_protocol_node_list.0 }}"
     run_once: true
 

roles/core_upgrade/tasks/apt/install.yml

@@ -4,20 +4,43 @@
 #
 - block:  ## when: not scale_daemon_running
     - block:
+        - name: Create comma-separated list
+          set_fact:
+             my_list: "{{ scale_install_all_packages + scale_install_license_packages }}"
+
+        - set_fact:
+              my_list: "{{my_list | join(' ')}}"
+
+        - debug:
+             msg: "{{my_list }}"
+
+        - name: Execute shell command
+          command: apt-get upgrade --allow-downgrades -y {{ my_list }} -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+          register: scale_install_debpackageresult
+          when: scale_install_directory_pkg_path is defined
+
+        - debug:
+             msg: "{{scale_install_debpackageresult}}"
+          when: scale_install_directory_pkg_path is defined
+
+
         - name: upgrade | Upgrade GPFS packages
           apt:
             deb: "{{ item }}"
             only_upgrade: true
           register: scale_install_debpackageresult
           with_items:
             - "{{ scale_install_all_packages }}"
+          when: scale_install_directory_pkg_path is not defined
+
 
         - name: upgrade | Upgrade GPFS License packages
           apt:
             deb: "{{ item }}"
             only_upgrade: true
           with_items:
             - "{{ scale_install_license_packages }}"
+          when: scale_install_directory_pkg_path is not defined
 
         - name: upgrade | Check if GPFS packages were updated
           set_fact:

roles/core_upgrade/tasks/install_dir_pkg.yml

@@ -74,13 +74,6 @@
     patterns: gpfs.docs*
   register: scale_install_gpfs_doc
 
-- name: upgrade | Check valid GPFS docs (gpfs.docs) package
-  assert:
-    that: scale_install_gpfs_doc.matched > 0
-    msg: >-
-      No GPFS docs (gpfs.docs) package found:
-      {{ dir_path }}/gpfs.docs*
-
 #
 # Find GPFS gpfs.msg.en_US
 #
@@ -90,13 +83,6 @@
     patterns: gpfs.msg.en*
   register: scale_install_gpfs_msg
 
-- name: upgrade | Check valid GPFS (gpfs.msg.en_US) package
-  assert:
-    that: scale_install_gpfs_msg.matched > 0
-    msg: >-
-      No GPFS BASE (gpfs.base) package found:
-      {{ dir_path }}/gpfs.msg.en*
-
 #
 # Find GPFS gpfs.compression
 #
@@ -106,12 +92,6 @@
     patterns: gpfs.compression*{{ scale_architecture }}*
   register: scale_install_gpfs_compression
 
-- name: upgrade | Check valid GPFS Compression(gpfs.compression) package
-  debug:
-    msg: >-
-      No GPFS Compression (gpfs.compression) package found:
-      {{ dir_path }}/gpfs.compression*{{ scale_architecture }}*
-  when: scale_install_gpfs_compression.matched < 1
 
 #
 # Find GSKit
@@ -122,13 +102,6 @@
     patterns: gpfs.gskit*{{ scale_architecture }}*
   register: scale_install_gpfs_gskit
 
-- name: upgrade | Check valid Global Security Kit (GSKit) package
-  assert:
-    that: scale_install_gpfs_gskit.matched > 0
-    msg: >-
-      No Global Security Kit (GSKit) package found:
-      {{ dir_path }}/gpfs.gskit*{{ scale_architecture }}*
-
 #
 # Add GPFS Packages
 #
@@ -139,9 +112,33 @@
     scale_install_all_packages: "{{ scale_install_all_packages + [ current_package ] }}"
   with_items:
     - "{{ scale_install_gpfs_base.files.0.path | basename }}"
+
+- name: upgrade | Add GPFS packages to list
+  vars:
+    current_package: "{{ dir_path }}/{{ item }}"
+  set_fact:
+    scale_install_all_packages: "{{ scale_install_all_packages + [ current_package ] }}"
+  with_items:
     - "{{ scale_install_gpfs_doc.files.0.path | basename }}"
+  when: scale_install_gpfs_doc.matched > 0 
+
+- name: upgrade | Add GPFS packages to list
+  vars:
+    current_package: "{{ dir_path }}/{{ item }}"
+  set_fact:
+    scale_install_all_packages: "{{ scale_install_all_packages + [ current_package ] }}"
+  with_items:
     - "{{ scale_install_gpfs_msg.files.0.path | basename }}"
+  when: scale_install_gpfs_msg.matched > 0
+
+- name: upgrade | Add GPFS packages to list
+  vars:
+    current_package: "{{ dir_path }}/{{ item }}"
+  set_fact:
+    scale_install_all_packages: "{{ scale_install_all_packages + [ current_package ] }}"
+  with_items:
     - "{{ scale_install_gpfs_gskit.files.0.path | basename }}"
+  when: scale_install_gpfs_gskit.matched > 0
 
 - name: upgrade | Add GPFS compression packages to list
   vars:
@@ -170,19 +167,14 @@
     patterns: gpfs.gpl*
   register: scale_install_gpfs_gpl
 
-- name: upgrade | Check valid GPFS GPL (gpfs.gpl) package
-  assert:
-    that: scale_install_gpfs_gpl.matched > 0
-    msg: >-
-      No GPFS GPL (gpfs.gpl) package found:
-      {{ dir_path }}/gpfs.gpl*
-
 - name: upgrade | Add GPFS packages for building GPL module from source to list
   vars:
     current_package: "{{ dir_path }}/{{ item }}"
   set_fact:
     scale_install_all_packages: "{{ scale_install_all_packages + [ current_package ] }}"
-  when: scale_install_gplbin_package is undefined
+  when:
+    - scale_install_gplbin_package is undefined
+    - scale_install_gpfs_gpl.matched > 0
   with_items: "{{ scale_install_gpfs_gpl.files.0.path | basename }}"
 
 #

roles/core_upgrade/tasks/install_license_pkg.yml

@@ -10,13 +10,6 @@
     patterns: gpfs.license*{{ scale_architecture }}*
   register: scale_install_gpfs_license
 
-- name: upgrade | Check valid GPFS License (gpfs.license) package
-  assert:
-    that: scale_install_gpfs_license.matched > 0
-    msg: >-
-      No GPFS License (gpfs.license) package found:
-      "{{ scale_gpfs_path_url }}/gpfs.license*{{ scale_architecture }}*"
-
 - name: upgrade | Check valid only one GPFS License (gpfs.license) package
   assert:
     that:
@@ -25,12 +18,14 @@
     msg: >-
       More than one GPFS License (gpfs.license) package found:
       "{{ scale_gpfs_path_url }}/gpfs.license*{{ scale_architecture }}*"
+  when: scale_install_directory_pkg_path is undefined
 
 - name: upgrade | Find GPFS License package
   vars:
     gpfs_license_package: "{{ scale_install_gpfs_license.files.0.path | basename }}"
   set_fact:
     scale_gpfs_license_package: "{{ gpfs_license_package }}"
+  when: scale_install_gpfs_license.matched > 0
 
 - block:
     #
@@ -51,10 +46,32 @@
         patterns: gpfs.crypto*{{ scale_architecture }}*
       register: scale_install_gpfs_crypto
   when: 
+    - scale_install_directory_pkg_path is undefined
     - '"gpfs.license.std" not in scale_gpfs_license_package'
     - '"gpfs.license.da" not in scale_gpfs_license_package'
 
 
+- block:
+    #
+    # Find GPFS adv packgae
+    #
+    - name: upgrade | Find GPFS Advance (gpfs.adv) package
+      find:
+        paths: "{{ scale_gpfs_path_url }}"
+        patterns: gpfs.adv*{{ scale_architecture }}*
+      register: scale_install_gpfs_adv
+
+    #
+    # Find GPFS crypto packgae
+    #
+    - name: upgrade | Find GPFS crypto (gpfs.crypto) package
+      find:
+        paths: "{{ scale_gpfs_path_url }}"
+        patterns: gpfs.crypto*{{ scale_architecture }}*
+      register: scale_install_gpfs_crypto
+  when:
+    - scale_install_directory_pkg_path is defined
+
 #
 # Add GPFS packages
 #
@@ -65,6 +82,7 @@
     scale_install_license_packages: "{{ scale_install_license_packages + [ current_package ] }}"
   with_items:
     - "{{ scale_install_gpfs_license.files.0.path | basename }}"
+  when: scale_install_gpfs_license.matched > 0
 
 #
 # Add GPFS packages
@@ -79,5 +97,28 @@
     - "{{ scale_install_gpfs_adv.files.0.path | basename }}"
     - "{{ scale_install_gpfs_crypto.files.0.path | basename }}"
   when: 
+    - scale_install_directory_pkg_path is undefined
     - '"gpfs.license.std" not in scale_gpfs_license_package'
     - '"gpfs.license.da" not in scale_gpfs_license_package'
+
+- name: upgrade | Add GPFS Dependent License packages to list
+  vars:
+    current_package: "{{ scale_gpfs_path_url }}/{{ item }}"
+  set_fact:
+    scale_install_license_packages: "{{ scale_install_license_packages + [ current_package ] }}"
+  with_items:
+    - "{{ scale_install_gpfs_adv.files.0.path | basename }}"
+  when:
+    - scale_install_directory_pkg_path is defined
+    - scale_install_gpfs_adv.matched > 0
+
+- name: upgrade | Add GPFS Dependent License packages to list
+  vars:
+    current_package: "{{ scale_gpfs_path_url }}/{{ item }}"
+  set_fact:
+    scale_install_license_packages: "{{ scale_install_license_packages + [ current_package ] }}"
+  with_items:
+    - "{{ scale_install_gpfs_crypto.files.0.path | basename }}"
+  when:
+    - scale_install_directory_pkg_path is defined
+    - scale_install_gpfs_crypto.matched > 0

roles/fal_install/tasks/install_repository.yml

@@ -22,7 +22,12 @@
   set_fact:
     scale_fal_url: 'gpfs_rpms/rhel9/'
   when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '9'
-
+
+- name: install | file audit logging path
+  set_fact:
+    scale_fal_url: 'gpfs_rpms/rhel9/'
+  when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '10'
+
 - name: install | file audit logging path
   set_fact:
     scale_fal_url: 'gpfs_debs/ubuntu/'
@@ -86,6 +91,7 @@
     repo: "{{ scale_install_repository_url }}{{ scale_fal_url }}"
     disable_gpg_check: no
     state: present
+    overwrite_multiple: yes
   when:
     - ansible_pkg_mgr == 'zypper'
     - scale_install_repository_url is defined

roles/gui_install/tasks/install_repository.yml

@@ -37,7 +37,7 @@
   zypper_repository:
     name: spectrum-scale-gui
     description: IBM Spectrum Scale (GUI)
-    repo: "{{ scale_install_repository_url }}/gpfs_rpms/"
+    repo: "{{ scale_install_repository_url }}gpfs_rpms/"
     disable_gpg_check: no
     state: present
     overwrite_multiple: yes

roles/hdfs_configure/tasks/configure.yml

@@ -265,7 +265,18 @@
      loop_control:
         loop_var: add_dn_item
 
-   - lineinfile: 
+   - name: configure | Set hadoop ident for scaleadmd
+     lineinfile: 
+       dest: /var/mmfs/hadoop/etc/hadoop/hadoop-env.sh  
+       state: present 
+       regexp: '# export HADOOP_IDENT_STRING=.'
+       line: 'export HADOOP_IDENT_STRING=root'
+     when: 
+       - scale_scaleadmd is defined  
+       - scale_scaleadmd == true   
+
+   - name: configure | Remove hadoop workers
+     lineinfile: 
        dest: /var/mmfs/hadoop/etc/hadoop/workers 
        state: absent 
        regexp: '(^\n)'
@@ -279,7 +290,7 @@
      register: initializedSharedEdits
      when: ha_enabled|bool and ces_hdfs_enabled|bool and ha_enable_dir.rc != 0
 
-   - name:  configure | suspend CES nodes
+   - name: configure | suspend CES nodes
      command: "/usr/lpp/mmfs/bin/mmces node suspend --stop -N {{ scale_hdfs_cluster.namenodes|join(',') }}"
      register: suspend_ces
      when:
@@ -291,11 +302,11 @@
      when:
        - check_hdfs_ces_group.rc == 0
 
-   - name:  configure | Enable CES
+   - name: configure | Enable CES
      command: "/usr/lpp/mmfs/bin/mmchnode --ces-group {{ scale_hdfs_ces_group_name }} -N {{ scale_hdfs_cluster.namenodes|join(',') }}"
      register: enable_ces
 
-   - name:  configure | start CES nodes
+   - name: configure | start CES nodes
      command: "/usr/lpp/mmfs/bin/mmces node resume --start -N {{ scale_hdfs_cluster.namenodes|join(',') }}"
      register: start_ces
      when:

roles/hdfs_install/defaults/main.yml

@@ -14,17 +14,5 @@ scale_install_localpkg_tmpdir_path: /tmp
 ## Flag to install hdfs debug package
 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.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.1.1.x hdfs package
-scale_hdfs_ubuntu_version_path: 'hdfs_debs/ubuntu/hdfs_3.1.1.x/'