aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-05-16 12:13:16 +0000
committerGerrit Code Review <review@openstack.org>2024-05-16 12:13:16 +0000
commit4ab17364e4e462ad7682efbe000c60bf871fcde9 (patch)
tree4baca0029fbe527016b23ba76cee22d5c05046c4
parentb8146efd1c671971028cac85942e06c5ab8890c5 (diff)
parentbdf60961f00531f4ef7e9e56ca114d2cc9988906 (diff)
downloadkolla-ansible-4ab17364e4e462ad7682efbe000c60bf871fcde9.tar.gz
kolla-ansible-4ab17364e4e462ad7682efbe000c60bf871fcde9.zip
Merge "ceilometer: use template for custom pipeline.yaml"
-rw-r--r--ansible/roles/ceilometer/tasks/config.yml4
-rw-r--r--releasenotes/notes/ceilometer-pipeline-yaml-as-template-8319d7fdeacd15f1.yaml5
2 files changed, 7 insertions, 2 deletions
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index 2835ec4be..02b575fd5 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -275,13 +275,13 @@
delegate_to: localhost
register: ceilometer_pipeline_file
-- name: Copying over pipeline.yaml
+- name: Copying over custom pipeline.yaml file
vars:
services_require_pipeline:
- ceilometer-compute
- ceilometer-central
- ceilometer-notification
- copy:
+ template:
src: "{{ node_custom_config }}/ceilometer/pipeline.yaml"
dest: "{{ node_config_directory }}/{{ item.key }}/pipeline.yaml"
force: True
diff --git a/releasenotes/notes/ceilometer-pipeline-yaml-as-template-8319d7fdeacd15f1.yaml b/releasenotes/notes/ceilometer-pipeline-yaml-as-template-8319d7fdeacd15f1.yaml
new file mode 100644
index 000000000..e1c1d6ecb
--- /dev/null
+++ b/releasenotes/notes/ceilometer-pipeline-yaml-as-template-8319d7fdeacd15f1.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ The ``ceilometer/pipeline.yaml`` file is now handled as a template
+ file.