Adding upstream version 10.0.0+dfsg.upstream/10.0.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 107 insertions, 17 deletions

diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_config/tasks/main.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_config/tasks/main.yml
index f9340f0fd..67bad8013 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_config/tasks/main.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_config/tasks/main.yml
@@ -4,6 +4,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: "present"
   register: powerflex_config_mdm_ip_result
@@ -13,6 +14,7 @@
   ansible.builtin.set_fact:
     powerflex_config_array_version: "{{ powerflex_config_mdm_ip_result.mdm_cluster_details.master.versionInfo[1] }}"
     powerflex_config_mdm_primary_hostname: "{{ hostvars[groups['mdm'][0]]['inventory_hostname'] }}"
+    powerflex_config_mdm_primary_ip: "{{ hostvars[groups['mdm'][0]]['ansible_host'] }}"
 
 - name: Login to primary MDM of PowerFlex 3.6
   ansible.builtin.command: scli --login --username {{ username }} --password "{{ password }}"
@@ -22,8 +24,30 @@
   delegate_to: "{{ powerflex_config_mdm_primary_hostname }}"
   when: powerflex_config_array_version == '3'
 
-- name: Login to primary MDM of PowerFlex 4.5
-  ansible.builtin.command: scli --login --username {{ username }} --management_system_ip {{ hostname }} --password "{{ password }}"
+- name: Generate login certificate for PowerFlex version 4.x
+  block:
+    - name: Generate login certificate using management_system_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }}
+        --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_config_generate_login_certificate
+      changed_when: powerflex_config_generate_login_certificate.rc == 0
+      delegate_to: "{{ powerflex_config_mdm_primary_hostname }}"
+      when: powerflex_config_array_version == '4'
+  rescue:
+    - name: Generate login certificate using primary_mdm_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ powerflex_config_mdm_primary_ip }} --username {{ username }}
+        --password {{ password }} --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_config_generate_login_certificate_mdm_ip
+      changed_when: powerflex_config_generate_login_certificate_mdm_ip.rc == 0
+      delegate_to: "{{ powerflex_config_mdm_primary_hostname }}"
+      when: powerflex_config_array_version == '4'
+
+- name: Login to MDM for PowerFlex version 4.x
+  ansible.builtin.command: scli --login --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }}
   run_once: true
   register: powerflex_config_login_output
   changed_when: powerflex_config_login_output.rc == 0
@@ -61,6 +85,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     storage_pool_name: "{{ powerflex_storage_pool_name }}"
     protection_domain_name: "{{ powerflex_protection_domain_name }}"
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_sdc/tasks/install_sdc.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_sdc/tasks/install_sdc.yml
index 9b75321c3..27c82db27 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_sdc/tasks/install_sdc.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_sdc/tasks/install_sdc.yml
@@ -4,6 +4,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: "present"
   register: powerflex_sdc_mdm_ip_result
@@ -71,5 +72,4 @@
     group: "root"
   notify: restart scini
   when:
-    - ansible_distribution != "VMkernel"
-    - " 'WindowsOS' not in ansible_distribution"
+    - ansible_distribution not in ['WindowsOS', 'SLES', 'VMkernel']
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_sdr/tasks/add_sdr.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_sdr/tasks/add_sdr.yml
index 1af345276..f7cbfa378 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_sdr/tasks/add_sdr.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_sdr/tasks/add_sdr.yml
@@ -4,6 +4,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: "present"
   register: powerflex_sdr_mdm_ip_result
@@ -39,17 +40,34 @@
   no_log: true
   when: powerflex_sdr_array_version == "3"
 
-- name: Login to mdm for PowerFlex version 4.x
-  ansible.builtin.command: >
-    scli --login --management_system_ip {{ hostname }}
-    --username admin
-    --password "{{ password }}"
-    --approve_certificate
+- name: Generate login certificate for PowerFlex version 4.x
+  block:
+    - name: Generate login certificate using management_system_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }}
+        --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_sdr_generate_login_certificate
+      changed_when: powerflex_sdr_generate_login_certificate.rc == 0
+      delegate_to: "{{ powerflex_sdr_mdm_primary_hostname }}"
+      when: powerflex_sdr_array_version != "3"
+  rescue:
+    - name: Generate login certificate using primary_mdm_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ powerflex_sdr_primary_mdm_ip }} --username {{ username }}
+        --password {{ password }} --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_sdr_generate_login_certificate_mdm_ip
+      changed_when: powerflex_sdr_generate_login_certificate_mdm_ip.rc == 0
+      delegate_to: "{{ powerflex_sdr_mdm_primary_hostname }}"
+      when: powerflex_sdr_array_version != "3"
+
+- name: Login to MDM for PowerFlex version 4.x
+  ansible.builtin.command: scli --login --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }}
   run_once: true
-  register: powerflex_initial_login
+  register: powerflex_sdr_login_output
+  changed_when: powerflex_sdr_login_output.rc == 0
   delegate_to: "{{ powerflex_sdr_mdm_primary_hostname }}"
-  changed_when: powerflex_initial_login.rc == 0
-  no_log: true
   when: powerflex_sdr_array_version != "3"
 
 - name: Output msg of previous task login to mdm
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_sds/tasks/install_sds.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_sds/tasks/install_sds.yml
index 8887ff13c..010aee075 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_sds/tasks/install_sds.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_sds/tasks/install_sds.yml
@@ -4,6 +4,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: "present"
   register: powerflex_sds_mdm_ip_result
@@ -17,6 +18,7 @@
   ansible.builtin.set_fact:
     powerflex_sds_mdm_ips: "{{ powerflex_sds_mdm_ip_result.mdm_cluster_details.mdmAddresses | join(',') }}"
     powerflex_sds_primary_mdm_hostname: "{{ hostvars[groups['mdm'][0]]['inventory_hostname'] }}"
+    powerflex_sds_primary_mdm_ip: "{{ hostvars[groups['mdm'][0]]['ansible_host'] }}"
 
 - name: Include install_powerflex.yml
   ansible.builtin.include_tasks: ../../powerflex_common/tasks/install_powerflex.yml
@@ -35,8 +37,30 @@
   ansible.builtin.set_fact:
     disks: "{{ powerflex_sds_disks }}"
 
+- name: Generate login certificate for PowerFlex version 4.x
+  block:
+    - name: Generate login certificate using management_system_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }}
+        --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_sds_generate_login_certificate
+      changed_when: powerflex_sds_generate_login_certificate.rc == 0
+      delegate_to: "{{ powerflex_sds_primary_mdm_hostname }}"
+      when: powerflex_sds_array_version != "3"
+  rescue:
+    - name: Generate login certificate using primary_mdm_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ powerflex_sds_primary_mdm_ip }} --username {{ username }}
+        --password {{ password }} --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_sds_generate_login_certificate_mdm_ip
+      changed_when: powerflex_sds_generate_login_certificate_mdm_ip.rc == 0
+      delegate_to: "{{ powerflex_sds_primary_mdm_hostname }}"
+      when: powerflex_sds_array_version != "3"
+
 - name: Login to MDM for PowerFlex version 4.x
-  ansible.builtin.command: scli --login --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }} --approve_certificate
+  ansible.builtin.command: scli --login --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }}
   run_once: true
   register: powerflex_sds_login_output
   changed_when: powerflex_sds_login_output.rc == 0
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/install_tb3x.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/install_tb3x.yml
index e602351da..ebb2011cc 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/install_tb3x.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/install_tb3x.yml
@@ -4,6 +4,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: "present"
   register: powerflex_tb_mdm_ip_result
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/uninstall_tb.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/uninstall_tb.yml
index b08bffed8..82de6e004 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/uninstall_tb.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_tb/tasks/uninstall_tb.yml
@@ -29,9 +29,30 @@
   when: powerflex_tb_mdm_cluster_mode[0] == "5_node" and powerflex_tb_scli_version[0] == '3'
 
 # Switch from three or five to cluster one node for PowerFlex version 4.5
-- name: Login to primary MDM node of PowerFlex version 4.5
-  ansible.builtin.command: >
-    scli --login --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }}
+- name: Generate login certificate for PowerFlex version 4.x
+  block:
+    - name: Generate login certificate using management_system_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ hostname }} --username {{ username }} --password {{ password }}
+        --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_tb_generate_login_certificate
+      changed_when: powerflex_tb_generate_login_certificate.rc == 0
+      delegate_to: "{{ powerflex_tb_mdm_primary_hostname }}"
+      when: powerflex_tb_scli_version[0] >= '4'
+  rescue:
+    - name: Generate login certificate using primary_mdm_ip
+      ansible.builtin.command: >
+        scli --generate_login_certificate --management_system_ip {{ powerflex_tb_primary_ip }} --username {{ username }}
+        --password {{ password }} --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }} --insecure
+      run_once: true
+      register: powerflex_tb_generate_login_certificate_mdm_ip
+      changed_when: powerflex_tb_generate_login_certificate_mdm_ip.rc == 0
+      delegate_to: "{{ powerflex_tb_mdm_primary_hostname }}"
+      when: powerflex_tb_scli_version[0] >= '4'
+
+- name: Login to MDM for PowerFlex version 4.x
+  ansible.builtin.command: scli --login --p12_path /opt/emc/scaleio/mdm/cfg/cli_certificate.p12 --p12_password {{ password }}
   run_once: true
   register: powerflex_tb_login_output
   changed_when: powerflex_tb_login_output.rc == 0
diff --git a/ansible_collections/dellemc/powerflex/roles/powerflex_webui/tasks/install_webui.yml b/ansible_collections/dellemc/powerflex/roles/powerflex_webui/tasks/install_webui.yml
index 13d58ffac..71886a075 100644
--- a/ansible_collections/dellemc/powerflex/roles/powerflex_webui/tasks/install_webui.yml
+++ b/ansible_collections/dellemc/powerflex/roles/powerflex_webui/tasks/install_webui.yml
@@ -10,6 +10,7 @@
     hostname: "{{ hostname }}"
     username: "{{ username }}"
     password: "{{ password }}"
+    port: "{{ port }}"
     validate_certs: "{{ validate_certs }}"
     state: present
   register: powerflex_webui_result