1 files changed, 11 insertions, 40 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
index 6b1882cc..1e3c04d7 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
@@ -7,45 +7,16 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- name: disable auto start
-  copy:
-    content: "#!/bin/sh\nexit 101"
-    dest: "/usr/sbin/policy-rc.d"
-    mode: 0755
-  when: ansible_os_family == "Debian"
-
-- name: install ceilometer packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: ceilometer_packages | union(packages_noarch)
-
-- name: enable auto start
-  file:
-    path=/usr/sbin/policy-rc.d
-    state=absent
-  when: ansible_os_family == "Debian"
-
-- name: copy ceilometer configs
-  template: src={{ item.src}} dest=/opt/os_templates
-  with_items: "{{ ceilometer_configs_templates }}"
-
-- name: update ceilometer configs
-  shell: crudini --merge {{ item.1 }} < /opt/os_templates/{{ item.0.src }}
-  with_subelements:
-    - ceilometer_configs_templates
-    - dest
-  notify: restart ceilometer relation service
-
-- name: change meter polling interval to 300s
-  replace:
-    dest: /etc/ceilometer/pipeline.yaml
-    regexp: 'interval: .+'
-    replace: 'interval: 300'
-  notify: restart ceilometer relation service
-
-- name: write services to monitor list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
-  with_items: ceilometer_services
+- include: ceilometer_install.yml
+  tags:
+    - install
+    - ceilometer_install
+    - ceilometer
+
+- include: ceilometer_config.yml
+  tags:
+    - config
+    - ceilometer_config
+    - ceilometer
 
 - meta: flush_handlers