Merge "[TRAIN-ONLY] Finish Ceilometer-Panko decouple" into stable/queens
This commit is contained in:
commit
d54a036b74
|
@ -81,25 +81,29 @@ outputs:
|
||||||
config_image: {get_param: DockerCeilometerConfigImage}
|
config_image: {get_param: DockerCeilometerConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/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
|
map_merge:
|
||||||
config_files:
|
- command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
|
||||||
list_concat:
|
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
|
||||||
- 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:
|
docker_config:
|
||||||
step_3:
|
step_3:
|
||||||
ceilometer_init_log:
|
ceilometer_init_log:
|
||||||
|
@ -129,9 +133,13 @@ outputs:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
-
|
||||||
- /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro
|
- /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/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:z
|
||||||
- /var/log/containers/ceilometer:/var/log/ceilometer
|
- if:
|
||||||
|
- ceilometer_enable_panko
|
||||||
|
- - /var/lib/config-data/puppet-generated/panko:/var/lib/kolla/config_files/src-panko:ro
|
||||||
|
- []
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
|
|
|
@ -8,4 +8,5 @@ resource_registry:
|
||||||
OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
|
OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
|
CeilometerEnablePanko: false
|
||||||
CeilometerQdrPublish: true
|
CeilometerQdrPublish: true
|
||||||
|
|
Loading…
Reference in New Issue