Browse Source

Merge "[TRAIN-ONLY] Finish Ceilometer-Panko decouple" into stable/queens

changes/47/733147/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
d54a036b74
2 changed files with 27 additions and 18 deletions
  1. +26
    -18
      docker/services/ceilometer-agent-notification.yaml
  2. +1
    -0
      environments/metrics/ceilometer-write-qdr.yaml

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

@@ -81,25 +81,29 @@ outputs:
config_image: {get_param: DockerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_notification.json:
command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
config_files:
list_concat:
- - source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
- if:
- ceilometer_enable_panko
- - source: "/var/lib/kolla/config_files/src-panko/*"
map_merge:
- command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
config_files:
list_concat:
- - source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
- null
- if:
- ceilometer_enable_panko
- - source: "/var/lib/kolla/config_files/src-panko/*"
dest: "/"
merge: true
preserve_properties: true
- null
- if:
- ceilometer_enable_panko
- permissions:
- path: /etc/panko
owner: root:ceilometer
recurse: true
- {}

permissions:
- path: /etc/panko
owner: root:ceilometer
recurse: true
docker_config:
step_3:
ceilometer_init_log:
@@ -129,9 +133,13 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
- /var/log/containers/ceilometer:/var/log/ceilometer:z
- if:
- ceilometer_enable_panko
- - /var/lib/config-data/puppet-generated/panko:/var/lib/kolla/config_files/src-panko:ro
- []

environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:


+ 1
- 0
environments/metrics/ceilometer-write-qdr.yaml View File

@@ -8,4 +8,5 @@ resource_registry:
OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml

parameter_defaults:
CeilometerEnablePanko: false
CeilometerQdrPublish: true

Loading…
Cancel
Save