X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fsensu-client.yaml;h=b64231cd6a41a4ada149c8fbab134193d1b2908e;hb=7585e655a6f4662ba48c2c9850f7938346d8137f;hp=db6daf997a16de4d3c8cacd734e01f5dabcd58c4;hpb=ce9f018e420614c68fe0c716f2e572b8f638e7b7;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index db6daf99..b64231cd 100644
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -4,19 +4,21 @@ description: >
   Containerized Sensu client service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSensuClientImage:
     description: image
-    default: 'centos-binary-sensu-client:latest'
+    type: string
+  DockerSensuConfigImage:
+    description: The container image to use for the sensu 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
@@ -71,6 +73,7 @@ resources:
     type: ../../puppet/services/monitoring/sensu-client.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
 
@@ -98,13 +101,15 @@ outputs:
         config_volume: sensu
         puppet_tags:  sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
         step_config: *step_config
-        config_image: &sensu_client_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
+        config_image: {get_param: DockerSensuConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sensu-client.json:
           command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/sensu
               owner: sensu:sensu
@@ -112,7 +117,7 @@ outputs:
       docker_config:
         step_3:
           sensu_client:
-            image: *sensu_client_image
+            image: {get_param: DockerSensuClientImage}
             net: host
             privileged: true
             # NOTE(mmagr) kolla image changes the user to 'sensu', we need it
@@ -126,7 +131,7 @@ outputs:
                 -
                   - /var/run/docker.sock:/var/run/docker.sock:rw
                   - /var/lib/kolla/config_files/sensu-client.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/sensu/etc/sensu/:/etc/sensu/:ro
+                  - /var/lib/config-data/puppet-generated/sensu/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/sensu:/var/log/sensu:rw
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS