Merge "Simplify pacemaker service templates"

deployment/pacemaker/clustercheck-container-puppet.yaml

@@ -37,7 +37,6 @@ parameters:
     type: json
 
 resources:
-
   ContainersCommon:
     type: ../containers-common.yaml
 
@@ -90,8 +89,7 @@ outputs:
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
-                -
-                  - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
+                - - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
                   - /var/lib/config-data/puppet-generated/clustercheck:/var/lib/kolla/config_files/src:ro
                   - /var/lib/mysql:/var/lib/mysql
             environment:

deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml

@@ -37,7 +37,6 @@ parameters:
     default: 6642
 
 resources:
-
   OVNDBsBase:
     type: ../ovn-dbs.yaml
     properties:

deployment/pacemaker/pacemaker-baremetal-puppet.yaml

@@ -129,8 +129,10 @@ parameter_groups:
   - CorosyncIPv6
 
 conditions:
-  pcmk_tls_priorities_empty: {equals: [{get_param: PacemakerTLSPriorities}, '']}
-  pcmk_bundle_op_timeout_empty: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']}
+  pcmk_tls_priorities_set:
+    not: {equals: [{get_param: PacemakerTLSPriorities}, '']}
+  pcmk_bundle_op_timeout_set:
+    not: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']}
   podman_enabled: {equals: [{get_param: ContainerCli}, 'podman']}
   is_ipv6:
     equals:
@@ -154,8 +156,7 @@ outputs:
            proto: 'udp'
            dport: 5405
       config_settings:
-        map_merge:
-        - pacemaker::corosync::cluster_name: 'tripleo_cluster'
+        pacemaker::corosync::cluster_name: 'tripleo_cluster'
         pacemaker::corosync::manage_fw: false
         pacemaker::resource_defaults::defaults:
           resource-stickiness: { value: INFINITY }
@@ -176,25 +177,22 @@ outputs:
               "%{hiera('$NETWORK')}"
             params:
               $NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
-        -
+        tripleo::pacemaker::tls_priorities:
           if:
-          - pcmk_tls_priorities_empty
-          - {}
-          - tripleo::pacemaker::tls_priorities: {get_param: PacemakerTLSPriorities}
-        -
+            - pcmk_tls_priorities_set
+            - {get_param: PacemakerTLSPriorities}
+        tripleo::profile::base::pacemaker::resource_op_defaults:
           if:
             - and:
-             - pcmk_bundle_op_timeout_empty
-             - not: podman_enabled
-          - {}
-          - tripleo::profile::base::pacemaker::resource_op_defaults:
-              bundle:
+                - pcmk_bundle_op_timeout_set
+                - podman_enabled
+            - bundle:
                 name: timeout
                 value:
                   if:
-                  - pcmk_bundle_op_timeout_empty
-                  - '120s'
+                    - pcmk_bundle_op_timeout_set
                     - {get_param: PacemakerBundleOperationTimeout}
+                    - '120s'
       service_config_settings:
         rsyslog:
           tripleo_logging_sources_pacemaker: