Change cluster init to use --transport (#414)

Check installed crmsh package version and use
legacy `-u` or new `--transport udpu` if version 5.0.0 or newer is used.
Decide according to the crmsh installed version.

Author: mpagot

ansible.cfg

@@ -2,5 +2,4 @@
 timeout = 20
 
 [ssh_connection]
-pipelining = True
 ssh_args = -C -o ControlMaster=auto -o ControlPersist=86400s

ansible/playbooks/roles/sap_hana_install/tasks/post_install/hdbuserstore.yml

@@ -1,6 +1,8 @@
 ---
 
 - name: SAP HANA Post Install - Create and Store Connection Info in hdbuserstore
+  vars:
+    ansible_pipelining: true
   ansible.builtin.shell: |
       /usr/sap/{{ sap_hana_install_sid }}/SYS/exe/hdb/hdbuserstore \
       SET {{ sap_hana_install_hdbuserstore_key }} \

ansible/playbooks/sap-hana-system-replication-hooks.yaml

@@ -1,5 +1,5 @@
 ---
-- name: SAP Hana system replication hoks
+- name: SAP Hana system replication hooks
   hosts: hana
   remote_user: cloudadmin
   become: true

ansible/playbooks/tasks/azure-cluster-bootstrap.yaml

@@ -159,6 +159,14 @@
     state: link
   when: ansible_distribution_major_version == '16'
 
+- name: Gather crmsh package facts
+  ansible.builtin.package_facts:
+    manager: auto
+
+- name: Set crmsh transport flag
+  ansible.builtin.set_fact:
+    crmsh_transport_flag: "{{ '--transport udpu' if ansible_facts.packages['crmsh'][0].version is version('5.0.0', '>=') else '-u' }}"
+
 - name: Softfail for old cloud-regionsrv-client in 15sp2
   ansible.builtin.debug:
     msg:
@@ -176,33 +184,21 @@
     sbd_paths: "{{ sbd_slurp['content'] | b64decode | regex_findall('SBD_DEVICE=(.+)') | last }}"
   when: use_sbd | default(false) | bool
 
-- name: Create the cluster on primary [sbd]
-  ansible.builtin.command:
-    cmd: >-
+- name: Set crm cluster init command
+  ansible.builtin.set_fact:
+    crm_cluster_init_cmd: >-
       crm cluster init
       -y
       -n qe-cluster
-      -s {{ sbd_paths }}
-      -w softdog
       -i eth0
-      -u
-    creates: /etc/corosync/corosync.conf
-  when:
-    - is_primary
-    - use_sbd | default(false) | bool
+      {{ crmsh_transport_flag }}
+      {{ '-s ' + sbd_paths + ' -w softdog' if use_sbd | default(false) | bool else '' }}
 
-- name: Create the cluster on primary [azure fencing]
+- name: Create the cluster on primary
   ansible.builtin.command:
-    cmd: >-
-      crm cluster init
-      -y
-      -n qe-cluster
-      -i eth0
-      -u
+    cmd: "{{ crm_cluster_init_cmd }}"
     creates: /etc/corosync/corosync.conf
-  when:
-    - is_primary
-    - not (use_sbd | default(false) | bool)
+  when: is_primary
 
 # check crm status
 - name: Check the cluster on primary

scripts/qesap/lib/cmds.py

@@ -313,7 +313,7 @@ def ansible_command_sequence(
     # 1. Create the environment variable set
     #    that will be used by any command
     original_env = dict(os.environ)
-    original_env["ANSIBLE_PIPELINING"] = "True"
+    original_env["ANSIBLE_PIPELINING"] = "False"
     original_env["ANSIBLE_TIMEOUT"] = "20"
     ansible_callbacks = []
     if profile:

scripts/qesap/test/conftest.py

@@ -230,9 +230,6 @@ def _callback(inventory):
 def mock_call_ansibleplaybook():
     """
     create a mock.call with some default elements
-    ```
-    mock.call('ansible-playbook -i inventory, playbook', env={'ANSIBLE_PIPELINING', 'True'})
-    ```
     """
 
     def _callback(inventory, playbook, verbosity="-vv", arguments=None, env=None):
@@ -241,7 +238,7 @@ def _callback(inventory, playbook, verbosity="-vv", arguments=None, env=None):
             playbook_cmd += arguments
         if env is None:
             original_env = dict(os.environ)
-            original_env["ANSIBLE_PIPELINING"] = "True"
+            original_env["ANSIBLE_PIPELINING"] = "False"
             original_env["ANSIBLE_TIMEOUT"] = "20"
         else:
             original_env = env

scripts/qesap/test/unit/test_qesap_ansible.py

@@ -625,7 +625,7 @@ def test_ansible_env_config(
     # Keep it here just to be more explicit and due to the fact that here
     # the os.environ is mock.
     expected_env = {"MELAMPO": "cane"}
-    expected_env["ANSIBLE_PIPELINING"] = "True"
+    expected_env["ANSIBLE_PIPELINING"] = "False"
     expected_env["ANSIBLE_TIMEOUT"] = "20"
     for playbook in playbook_files_list:
         calls.append(mock_call_ansibleplaybook(inventory, playbook, env=expected_env))
@@ -671,8 +671,12 @@ def test_ansible_profile(
     playbook_files_list = create_playbooks(playbooks["create"])
     calls = []
     expected_env = {"MELAMPO": "cane"}
+<<<<<<< HEAD
     expected_env["ANSIBLE_PIPELINING"] = "True"
     expected_env["ANSIBLE_TIMEOUT"] = "20"
+=======
+    expected_env["ANSIBLE_PIPELINING"] = "False"
+>>>>>>> 94e5754 (Remove pipelining from ansible.cfg)
     expected_env["ANSIBLE_CALLBACKS_ENABLED"] = "ansible.posix.profile_tasks"
     for playbook in playbook_files_list:
         calls.append(mock_call_ansibleplaybook(inventory, playbook, env=expected_env))
@@ -721,8 +725,12 @@ def test_ansible_junit(
     playbook_files_list = create_playbooks(playbooks["create"])
     calls = []
     expected_env = {"MELAMPO": "cane"}
+<<<<<<< HEAD
     expected_env["ANSIBLE_PIPELINING"] = "True"
     expected_env["ANSIBLE_TIMEOUT"] = "20"
+=======
+    expected_env["ANSIBLE_PIPELINING"] = "False"
+>>>>>>> 94e5754 (Remove pipelining from ansible.cfg)
     expected_env["ANSIBLE_CALLBACKS_ENABLED"] = "junit"
     expected_env["JUNIT_OUTPUT_DIR"] = "/something/somewhere"
     for playbook in playbook_files_list:
@@ -777,8 +785,12 @@ def test_ansible_env_roles_path(
     playbook_files_list = create_playbooks(["get_cherry_wood"])
     calls = []
     expected_env = dict(os.environ)
+<<<<<<< HEAD
     expected_env["ANSIBLE_PIPELINING"] = "True"
     expected_env["ANSIBLE_TIMEOUT"] = "20"
+=======
+    expected_env["ANSIBLE_PIPELINING"] = "False"
+>>>>>>> 94e5754 (Remove pipelining from ansible.cfg)
     expected_env["ANSIBLE_ROLES_PATH"] = "somewhere"
     for playbook in playbook_files_list:
         calls.append(mock_call_ansibleplaybook(inventory, playbook, env=expected_env))