Merge pull request #586 from rajan-mis/object_signing_fix-master

Object Signing requirement fix and adding protocol node into existing…

Author: rajan-mis

roles/nfs/common/tasks/configure.yml

@@ -102,6 +102,30 @@
         ( scale_service_status.rc == 0 )
   run_once: true
 
+- name: configure | Check if OBJ is running
+  shell:
+   cmd: "{{ scale_command_path }}mmces service list|grep OBJ"
+  register: scale_service_status
+  when: (ansible_fqdn in scale_protocol_node_list) or
+        (inventory_hostname in scale_protocol_node_list)
+  ignore_errors: true
+  failed_when: false
+  run_once: true
+
+- name: configure | Add OBJ service to the list
+  set_fact:
+   scale_service_list: "{{ scale_service_list + [scale_service_status.stderr|regex_search('OBJ')] }}"
+  when: (ansible_fqdn in scale_protocol_node_list or inventory_hostname in scale_protocol_node_list) and
+        ( scale_service_status.rc > 0 )
+  run_once: true
+
+- name: configure | Add OBJ service to the list
+  set_fact:
+   scale_service_list: "{{ scale_service_list + ['OBJ'] }}"
+  when: (ansible_fqdn in scale_protocol_node_list or inventory_hostname in scale_protocol_node_list) and
+        ( scale_service_status.rc == 0 )
+  run_once: true
+
 - import_role:
    name: nfs/node
   when: scale_ces_disabled_nodes|length > 0 and 'NFS' in scale_service_list
@@ -110,6 +134,10 @@
    name: smb/node
   when: scale_ces_disabled_nodes|length > 0 and 'SMB' in scale_service_list
 
+- import_role:
+   name: scale_object/node
+  when: scale_ces_disabled_nodes|length > 0 and 'OBJ' in scale_service_list
+
 - name: configure | Prepare ces nodes string
   set_fact:
    scale_ces_nodes: "{{ scale_ces_nodes + ',' + item|string }}"

roles/scale_object/node/meta/main.yml

@@ -20,5 +20,3 @@ galaxy_info:
 
 dependencies: 
     - scale_object/precheck
-    - nfs/common
-

roles/scale_object/node/tasks/install_pmswift.yml

@@ -12,14 +12,23 @@
         scale_zimon_url: 'zimon_rpms/rhel8'
       when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
 
+    - name: install | pmswift path
+      set_fact:
+        scale_gpg_key_path:
+             - "{{ scale_gpgKey_repository_obj_src }}"
+             - "{{ scale_gpgKey_repository_src }}"
+      when: scale_version >= "5.1.2.2"
+
     - name: install | Configure ZIMon YUM repository
       yum_repository:
         name: spectrum-scale-zimon
         description: IBM Spectrum Scale (ZIMon)
         baseurl: "{{ scale_install_repository_url }}{{ scale_zimon_url }}"
         gpgcheck: "{{ scale_install_gpgcheck }}"
+        gpgkey: "{{ scale_gpg_key_path }}"
         repo_gpgcheck: no
         state: present
+        sslverify: false
       notify: yum-clean-metadata
       when:
         - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'

roles/scale_object/node/tasks/install_repository.yml

@@ -4,12 +4,20 @@
     scale_obj_url: 'object_rpms/rhel8/'
   when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
 
+- name: install | pmswift path
+  set_fact:
+     scale_gpg_key_path:
+        - "{{ scale_gpgKey_repository_obj_src }}"
+        - "{{ scale_gpgKey_repository_src }}"
+  when: scale_version >= "5.1.2.2"
+
 - name: install | configure object YUM repository
   yum_repository:
     name: spectrum-scale-object-rpms
     description: IBM Spectrum Scale (object RPMS)
     baseurl: "{{ scale_install_repository_url }}{{ scale_obj_url }}"
     gpgcheck: "{{ scale_install_gpgcheck }}"
+    gpgkey: "{{ scale_gpg_key_path }}"
     repo_gpgcheck: no
     sslverify: no
     state: present

roles/scale_object/node/vars/main.yml

@@ -8,3 +8,7 @@ scale_rpmversion: "{{ scale_version | regex_replace('^([0-9.]+)\\.([0-9])$', '\\
 ## Default scale extraction path
 scale_extracted_default_path: "/usr/lpp/mmfs"
 scale_extracted_path: "{{ scale_extracted_default_path }}/{{ scale_version }}"
+
+scale_gpg_key_path: "{{ scale_gpgKey_repository_src }}"
+
+scale_gpgKey_repository_obj_src: "{{ scale_install_repository_url }}Public_Keys/RPM-GPG-KEY-redhat-release"

roles/scale_object/upgrade/meta/main.yml

@@ -20,4 +20,3 @@ galaxy_info:
 
 dependencies: 
     - core/common
-    - nfs/common

roles/scale_object/upgrade/tasks/install_repository.yml

@@ -4,12 +4,20 @@
     scale_obj_url: 'object_rpms/rhel8/'
   when: ansible_distribution in scale_rhel_distribution and ansible_distribution_major_version == '8'
 
+- name: install | pmswift path
+  set_fact:
+     scale_gpg_key_path:
+        - "{{ scale_gpgKey_repository_obj_src }}"
+        - "{{ scale_gpgKey_repository_src }}"
+  when: scale_version >= "5.1.2.2"
+
 - name: upgrade | configure object YUM repository
   yum_repository:
     name: spectrum-scale-object-rpms
     description: IBM Spectrum Scale (object RPMS)
     baseurl: "{{ scale_install_repository_url }}{{ scale_obj_url }}"
     gpgcheck: "{{ scale_install_gpgcheck }}"
+    gpgkey: "{{ scale_gpg_key_path }}"
     repo_gpgcheck: no
     sslverify: no
     state: present

roles/scale_object/upgrade/vars/main.yml

@@ -8,3 +8,7 @@ scale_rpmversion: "{{ scale_version | regex_replace('^([0-9.]+)\\.([0-9])$', '\\
 ## Default scale extraction path
 scale_extracted_default_path: "/usr/lpp/mmfs"
 scale_extracted_path: "{{ scale_extracted_default_path }}/{{ scale_version }}"
+
+scale_gpg_key_path: "{{ scale_gpgKey_repository_src }}"
+
+scale_gpgKey_repository_obj_src: "{{ scale_install_repository_url }}Public_Keys/RPM-GPG-KEY-redhat-release"