Remove check for firwalld running, fix checking mssql_ha_replica_type

README.md

@@ -382,9 +382,6 @@ Type: `str`
 
 Whether to configure firewall for high availability or not.
 
-The role configures firewall only if the `firewalld` service has been started or
-enabled.
-
 Default: `true`
 
 Type: `bool`

tasks/main.yml

@@ -448,13 +448,7 @@
     - name: >-
         Open the {{ mssql_ha_listener_port }}/tcp port and
         enable the high-availability service
-      when:
-        - mssql_ha_firewall_configure | bool
-        - >-
-          ('running' in
-          ansible_facts['services']['firewalld.service']['state']) or
-          ('enabled' in
-          ansible_facts['services']['firewalld.service']['status'])
+      when: mssql_ha_firewall_configure | bool
       include_role:
         name: fedora.linux_system_roles.firewall
       vars:

tests/tests_configure_ha_cluster.yml

@@ -11,26 +11,6 @@
     mssql_ha_db_name: ExampleDB
     mssql_debug: true
   tasks:
-    # - name: Gather system services facts
-    #   service_facts:
-
-    # - name: Open firewall ports for TCP connection to SQL Server
-    #   vars:
-    #     firewall:
-    #       - port: "{{
-    #           '1433' if mssql_tcp_port is not defined else mssql_tcp_port
-    #           }}/tcp"
-    #         zone: public
-    #         state: enabled
-    #         permanent: true
-    #         runtime: true
-    #     when: >-
-    #       ('running' in
-    #       ansible_facts['services']['firewalld.service']['state']) or
-    #       ('enabled' in
-    #       ansible_facts['services']['firewalld.service']['status'])
-    #   include_role:
-    #     name: fedora.linux_system_roles.firewall
     - name: Skip this test on EL < 8 because ha_cluster does not support it
       meta: end_play
       when:
@@ -40,9 +20,9 @@
     - name: Set the mssql_ha_replica_type fact to appear in hostvars
       set_fact:
         mssql_ha_replica_type: primary
-      when: ansible_play_hosts_all |
-            map('extract', hostvars, 'mssql_ha_replica_type') |
-            list is not defined
+      when:
+        - ansible_play_hosts_all | length == 1
+        - mssql_ha_replica_type is not defined
 
     - name: Set up test environment for the ha_cluster role
       include_role: