summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ceilometer_controller
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-10-13 23:49:44 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-10-13 23:49:44 +0800
commita682e18d16a7e8862bd0e10882cbe1f197973d3b (patch)
tree38d55e28f6b0ca4108326050d5533b0084874f7e /deploy/adapters/ansible/roles/ceilometer_controller
parentcb004d80668a6bf63e208e81bf3c4fa86d889dcf (diff)
bugfix: generate config file error
JIRA: COMPASS-95 Change-Id: I223e8afbb909be72937f159d766817803b3c2ab6 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml6
2 files changed, 5 insertions, 3 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
index 4fddd1e6..cb78acb6 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
@@ -3,7 +3,7 @@
- name: install ceilometer packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: "{{ ceilometer_packages }}| union(packages_noarch)"
+ with_items: ceilometer_packages | union(packages_noarch)
- name: copy ceilometer configs
template: src={{ item.src}} dest=/opt/os_templates
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
index 8317a3eb..9aeacfa7 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
@@ -18,9 +18,11 @@ ceilometer_services:
ceilometer_configs_templates:
- src: ceilometer.j2
- dest: /etc/ceilometer/ceilometer.conf
+ dest:
+ - /etc/ceilometer/ceilometer.conf
- src: cinder.j2
- dest: /etc/cinder/cinder.conf
+ dest:
+ - /etc/cinder/cinder.conf
- src: glance.j2
dest:
- /etc/glance/glance-api.conf