diff options
| author |   Justin chi <chigang@huawei.com> | 2015-10-15 01:41:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-15 01:41:48 +0000 |
| commit | 76344ea62126a46ab6fcc2c729b52575ecfc24a4 (patch) | |
| tree | d78597dafc6032f8b652d9762ac9df69d7fda144 /deploy/adapters/ansible/roles/ceilometer_controller | |
| parent | 252206f17671d3383a9f5dfe06e6f4ee13b00e90 (diff) | |
| parent | a682e18d16a7e8862bd0e10882cbe1f197973d3b (diff) | |
Merge "bugfix: generate config file error"
Diffstat (limited to 'deploy/adapters/ansible/roles/ceilometer_controller')
| -rw-r--r-- | deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml | 6 |
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 |