X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fpacemaker%2Fclustercheck.yaml;h=6db8a212f9b54c95fe8ec09d3eec1bd542938b12;hb=73616922e481b66fc2bfff145d7c1130ce1a6552;hp=bad2acf6faaca17517f617247aa278beede7d7ca;hpb=24a5fd643919bd3197d1ccc7f70273a9a70511e9;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index bad2acf6..6db8a212 100644
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/docker/services/pacemaker/clustercheck.yaml
@@ -6,19 +6,21 @@ description: >
   the local galera node is synced
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerClustercheckImage:
     description: image
-    default: 'centos-binary-mariadb:latest'
+    type: string
+  DockerClustercheckConfigImage:
+    description: The container image to use for the clustercheck config_volume
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -42,10 +44,14 @@ 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}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -57,37 +63,28 @@ 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:
         config_volume: clustercheck
         puppet_tags: file # set this even though file is the default
         step_config: "include ::tripleo::profile::pacemaker::clustercheck"
-        config_image: &clustercheck_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerClustercheckImage} ]
+        config_image: {get_param: DockerClustercheckConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/clustercheck.json:
           command: /usr/sbin/xinetd -dontfork
           config_files:
-          - dest: /etc/xinetd.conf
-            source: /var/lib/kolla/config_files/src/etc/xinetd.conf
-            owner: mysql
-            perm: '0644'
-          - dest: /etc/xinetd.d/galera-monitor
-            source: /var/lib/kolla/config_files/src/etc/xinetd.d/galera-monitor
-            owner: mysql
-            perm: '0644'
-          - dest: /etc/sysconfig/clustercheck
-            source: /var/lib/kolla/config_files/src/etc/sysconfig/clustercheck
-            owner: mysql
-            perm: '0600'
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
       docker_config:
         step_2:
           clustercheck:
             start_order: 1
-            image: *clustercheck_image
+            image: {get_param: DockerClustercheckImage}
             restart: always
             net: host
             volumes:
@@ -95,9 +92,11 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
-                  - /var/lib/config-data/clustercheck/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/clustercheck/:/var/lib/kolla/config_files/src:ro
                   - /var/lib/mysql:/var/lib/mysql
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
       upgrade_tasks:
+      update_tasks:
+        # Nothing: It's not managed by pacemaker, so let paunch do it.