aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2016-10-17 16:17:45 +0200
committerChristian Berendt <berendt@betacloud-solutions.de>2016-10-17 16:17:45 +0200
commit88bbd1bb2443c4f664fb8a364af4a7d6a202fdcf (patch)
tree116f7461d495ed8231e1c6d6aeaf62981c022807
parentfbdcf34db77475cea6baeb4ce10d496378282ef7 (diff)
downloadkolla-88bbd1bb2443c4f664fb8a364af4a7d6a202fdcf.tar.gz
kolla-88bbd1bb2443c4f664fb8a364af4a7d6a202fdcf.zip
Fix configuration templates used for Ceilometer
* global ceilometer.conf file is missing * makes no sense to use glance configuration files for Ceilometer TrivialFix Change-Id: Ia37d28e8d854e6a1dc48bfa96afdaee2061be9a7
-rw-r--r--ansible/roles/ceilometer/tasks/config.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index bb3519ceb..5d9336fec 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -40,8 +40,7 @@
- "{{ node_custom_config }}/global.conf"
- "{{ node_custom_config }}/database.conf"
- "{{ node_custom_config }}/messaging.conf"
- - "{{ node_custom_config }}/glance.conf"
- - "{{ node_custom_config }}/glance/{{ item }}.conf"
+ - "{{ node_custom_config }}/ceilometer.conf"
- "{{ node_custom_config }}/ceilometer/{{ item }}.conf"
- "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceilometer.conf"