From e05b3ac0e1b96be8ad600a6fdd84a47da4f1e66f Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 6 May 2017 09:46:42 +0800
Subject: [PATCH] Fix panko source and dest file path in ceilometer config

* Use absolute path for panko.conf.j2
* Fix the destination path.

Change-Id: I3abc0bf000be8af3a0cde1f43901245e027bb469
Closes-Bug: #1688681
---
 ansible/roles/ceilometer/tasks/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index d6276c3592..52ef3318a4 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -91,12 +91,12 @@
       - ceilometer-collector
   merge_configs:
     sources:
-      - ../panko/templates/panko.conf.j2
+      - "{{ role_path }}/../panko/templates/panko.conf.j2"
       - "{{ node_custom_config }}/global.conf"
       - "{{ node_custom_config }}/panko.conf"
       - "{{ node_custom_config }}/panko/panko.conf"
       - "{{ node_custom_config }}/panko/{{ inventory_hostname }}/panko.conf"
-    dest: "{{ node_config_directory }}/panko/panko.conf"
+    dest: "{{ node_config_directory }}/{{ item.key }}/panko.conf"
   register: panko_confs
   when:
     - ceilometer_event_type == 'panko'