openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "ceilometer_agent_notification: disable-panko.yaml" into stable/queens

This commit is contained in:
Zuul 2019-07-08 18:40:34 +00:00 committed by Gerrit Code Review
parent 1c43d4985d de9453ba2a
commit 1e87d16eed
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/services/ceilometer-agent-notification.yaml
View File

@ -83,17 +83,19 @@ outputs:
/var/lib/kolla/config_files/ceilometer_agent_notification.json: /var/lib/kolla/config_files/ceilometer_agent_notification.json:
command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" list_concat:
dest: "/" - - source: "/var/lib/kolla/config_files/src/*"
merge: true
preserve_properties: true
- if:
- ceilometer_enable_panko
- source: "/var/lib/kolla/config_files/src-panko/*"
dest: "/" dest: "/"
merge: true merge: true
preserve_properties: true preserve_properties: true
- '' - if:
- ceilometer_enable_panko
- - source: "/var/lib/kolla/config_files/src-panko/*"
dest: "/"
merge: true
preserve_properties: true
- null
permissions: permissions:
- path: /etc/panko - path: /etc/panko
owner: root:ceilometer owner: root:ceilometer