Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...

[apex-tripleo-heat-templates.git] / docker / services / pacemaker / clustercheck.yaml

diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index c7c316a..6db8a21 100644 (file)
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/docker/services/pacemaker/clustercheck.yaml
@@ -44,8 +44,11 @@ resources:
   ContainersCommon:
     type: ../containers-common.yaml
 
+# We import from the corresponding docker service because otherwise we risk
+# rewriting the tripleo.mysql.firewall_rules key with the baremetal firewall
+# rules (see LP#1728918)
   MysqlPuppetBase:
-    type: ../../../puppet/services/pacemaker/database/mysql.yaml
+    type: ../../../docker/services/pacemaker/database/mysql.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
@@ -60,6 +63,8 @@ outputs:
     value:
       service_name: clustercheck
       config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
       step_config: "include ::tripleo::profile::pacemaker::clustercheck"
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -93,3 +98,5 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
       upgrade_tasks:
+      update_tasks:
+        # Nothing: It's not managed by pacemaker, so let paunch do it.