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_tls_priorities_set:
-  pcmk_bundle_op_timeout_empty: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']}
+    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,47 +156,43 @@ 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::corosync::manage_fw: false
+        pacemaker::resource_defaults::defaults:
-          pacemaker::resource_defaults::defaults:
+          resource-stickiness: { value: INFINITY }
-            resource-stickiness: { value: INFINITY }
+        corosync_token_timeout: 10000
-          corosync_token_timeout: 10000
+        pacemaker::corosync::settle_tries: {get_param: CorosyncSettleTries}
-          pacemaker::corosync::settle_tries: {get_param: CorosyncSettleTries}
+        pacemaker::resource::bundle::deep_compare: true
-          pacemaker::resource::bundle::deep_compare: true
+        pacemaker::resource::ip::deep_compare: true
-          pacemaker::resource::ip::deep_compare: true
+        pacemaker::resource::ocf::deep_compare: true
-          pacemaker::resource::ocf::deep_compare: true
+        corosync_ipv6: {if: [is_ipv6, true, false]}
-          corosync_ipv6: {if: [is_ipv6, true, false]}
+        tripleo::fencing::config: {get_param: FencingConfig}
-          tripleo::fencing::config: {get_param: FencingConfig}
+        tripleo::fencing::deep_compare: true
-          tripleo::fencing::deep_compare: true
+        enable_fencing: {get_param: EnableFencing}
-          enable_fencing: {get_param: EnableFencing}
+        hacluster_pwd: {get_param: PcsdPassword}
-          hacluster_pwd: {get_param: PcsdPassword}
+        tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey}
-          tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey}
+        tripleo::profile::base::pacemaker::pcsd_bind_addr:
-          tripleo::profile::base::pacemaker::pcsd_bind_addr:
+          str_replace:
-            str_replace:
+            template:
-              template:
+              "%{hiera('$NETWORK')}"
-                "%{hiera('$NETWORK')}"
+            params:
-              params:
+              $NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
-                $NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
+        tripleo::pacemaker::tls_priorities:
-        -
           if:
-          - pcmk_tls_priorities_empty
+            - pcmk_tls_priorities_set
-          - {}
+            - {get_param: PacemakerTLSPriorities}
-          - tripleo::pacemaker::tls_priorities: {get_param: PacemakerTLSPriorities}
+        tripleo::profile::base::pacemaker::resource_op_defaults:
-        -
           if:
-          -  and:
+            - and:
-             - pcmk_bundle_op_timeout_empty
+                - pcmk_bundle_op_timeout_set
-             - not: podman_enabled
+                - podman_enabled
-          - {}
+            - bundle:
-          - tripleo::profile::base::pacemaker::resource_op_defaults:
-              bundle:
                 name: timeout
                 value:
                   if:
-                  - pcmk_bundle_op_timeout_empty
+                    - pcmk_bundle_op_timeout_set
-                  - '120s'
+                    - {get_param: PacemakerBundleOperationTimeout}
-                  - {get_param: PacemakerBundleOperationTimeout}
+                    - '120s'
       service_config_settings:
         rsyslog:
           tripleo_logging_sources_pacemaker: