docker: add logging(source & groups)

[apex-tripleo-heat-templates.git] / docker / services / ceilometer-agent-notification.yaml

diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index a1579cc..6c49513 100644 (file)
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Ceilometer Agent Notification service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCeilometerNotificationImage:
     description: image
-    default: 'centos-binary-ceilometer-notification:latest'
     type: string
   DockerCeilometerConfigImage:
     description: The container image to use for the ceilometer config_volume
-    default: 'centos-binary-ceilometer-central:latest'
     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
@@ -48,6 +46,7 @@ resources:
     type: ../../puppet/services/ceilometer-agent-notification.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -59,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentNotificationBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]}
@@ -67,26 +68,28 @@ outputs:
         config_volume: ceilometer
         puppet_tags: ceilometer_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
+        config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_notification.json:
-          command: /usr/bin/ceilometer-agent-notification
+          command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-panko/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+          permissions:
+            - path: /etc/panko
+              owner: root:ceilometer
+              recurse: true
       docker_config:
         step_3:
           ceilometer_init_log:
             start_order: 0
-            image: &ceilometer_agent_notification_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
+            image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
@@ -103,8 +106,15 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/panko/:/var/lib/kolla/config_files/src-panko:ro
+                  - /var/log/containers/ceilometer:/var/log/ceilometer
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/ceilometer
+            state: directory
       upgrade_tasks:
         - name: Stop and disable ceilometer agent notification service
           tags: step2