Merge "Add release note for generated sample environments"

[apex-tripleo-heat-templates.git] / docker / services / sensu-client.yaml

diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index e6bdf15..42b0c57 100644 (file)
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-sensu-client:latest'
     type: string
+  DockerSensuConfigImage:
+    description: The container image to use for the sensu config_volume
+    default: 'centos-binary-sensu-client:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -98,17 +102,24 @@ 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
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerSensuConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/sensu-client.json:
-          command: /usr/bin/sensu-client -d /etc/sensu/conf.d/
+          command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
+          permissions:
+            - path: /var/log/sensu
+              owner: sensu:sensu
+              recurse: true
       docker_config:
         step_3:
           sensu_client:
-            image: *sensu_client_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
             net: host
             privileged: true
             # NOTE(mmagr) kolla image changes the user to 'sensu', we need it
@@ -123,8 +134,14 @@ 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/log/containers/sensu:/var/log/sensu:rw
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/sensu
+            state: directory
       upgrade_tasks:
         - name: Stop and disable sensu-client service
           tags: step2