aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-12 04:22:36 +0000
committerGerrit Code Review <review@openstack.org>2017-09-12 04:22:36 +0000
commit5dd018186195a735621a0ab8d4e4fd4aaafb5d38 (patch)
tree1ae4ffff5992d01e0345bc0ac9895f7894688ca0 /docker
parent5d8c2116797c098df6fa2783feb2ae828aca31a1 (diff)
parent6c341975ae21dc9a5a157424b0c7d235ef11b668 (diff)
Merge "Add panko config to ceilometer notification agent container" into stable/pike
Diffstat (limited to 'docker')
-rw-r--r--docker/services/ceilometer-agent-notification.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index d8afe69..891750a 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -75,6 +75,14 @@ outputs:
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:
@@ -96,6 +104,7 @@ 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