aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-26 16:02:25 +0000
committerGerrit Code Review <review@openstack.org>2016-07-26 16:02:25 +0000
commit27e7f4bc5d18191cf59edd8b80ce142a3c3abfa0 (patch)
treed11c58697d63ade3729f42c573118c2d13c7ba82
parentb44abe078fe7c0a601d82238c21bc22bf0f9f314 (diff)
parent1a549d0cc3ee61dad9b10badc1da3a744f00b1b1 (diff)
downloadkolla-27e7f4bc5d18191cf59edd8b80ce142a3c3abfa0.tar.gz
kolla-27e7f4bc5d18191cf59edd8b80ce142a3c3abfa0.zip
Merge "Allow custom configurations for ceilometer"
-rw-r--r--ansible/roles/ceilometer/tasks/config.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index b3f29ef8c..97a537289 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -32,6 +32,8 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/glance.conf"
- "/etc/kolla/config/glance/{{ item }}.conf"
+ - "{{ node_custom_config }}/ceilometer/{{ item }}.conf"
+ - "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf"
with_items:
- "ceilometer-notification"