diff --git a/roles/ceilometer/tasks/ceilometer-nova.yml b/roles/ceilometer/tasks/ceilometer-nova.yml
index 0160046..871a848 100644
--- a/roles/ceilometer/tasks/ceilometer-nova.yml
+++ b/roles/ceilometer/tasks/ceilometer-nova.yml
@@ -11,11 +11,6 @@
   template: src={{ item }}.j2 dest=/etc/ceilometer/{{ item }}
   with_items:
     - ceilometer.conf
-
-- name: install configuration
-  tags: config
-  copy: src={{ item }} dest=/etc/ceilometer/{{ item }}
-  with_items:
     - pipeline.yaml
 
 - name: start services
diff --git a/roles/ceilometer/tasks/controller.yml b/roles/ceilometer/tasks/controller.yml
index 2f9aaa5..949eb2e 100644
--- a/roles/ceilometer/tasks/controller.yml
+++ b/roles/ceilometer/tasks/controller.yml
@@ -40,11 +40,6 @@
   template: src={{ item }}.j2 dest=/etc/ceilometer/{{ item }}
   with_items:
     - ceilometer.conf
-
-- name: install configuration
-  tags: config
-  copy: src={{ item }} dest=/etc/ceilometer/{{ item }}
-  with_items:
     - pipeline.yaml
 
 - name: start services
diff --git a/roles/ceilometer/templates/pipeline.yaml.j2 b/roles/ceilometer/templates/pipeline.yaml.j2
new file mode 100644
index 0000000..a5bd514
--- /dev/null
+++ b/roles/ceilometer/templates/pipeline.yaml.j2
@@ -0,0 +1,92 @@
+---
+sources:
+    - name: meter_source
+      interval: 600
+      meters:
+          - "*"
+      sinks:
+          - meter_sink
+    - name: cpu_source
+      interval: 600
+      meters:
+          - "cpu"
+      sinks:
+          - cpu_sink
+          - cpu_delta_sink
+    - name: disk_source
+      interval: 600
+      meters:
+          - "disk.read.bytes"
+          - "disk.read.requests"
+          - "disk.write.bytes"
+          - "disk.write.requests"
+          - "disk.device.read.bytes"
+          - "disk.device.read.requests"
+          - "disk.device.write.bytes"
+          - "disk.device.write.requests"
+      sinks:
+          - disk_sink
+    - name: network_source
+      interval: 600
+      meters:
+          - "network.incoming.bytes"
+          - "network.incoming.packets"
+          - "network.outgoing.bytes"
+          - "network.outgoing.packets"
+      sinks:
+          - network_sink
+sinks:
+    - name: meter_sink
+      transformers:
+      publishers:
+          - notifier://
+    - name: cpu_sink
+      transformers:
+          - name: "rate_of_change"
+            parameters:
+                target:
+                    name: "cpu_util"
+                    unit: "%"
+                    type: "gauge"
+                    scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
+      publishers:
+          - notifier://
+    - name: cpu_delta_sink
+      transformers:
+          - name: "delta"
+            parameters:
+                target:
+                    name: "cpu.delta"
+                growth_only: True
+      publishers:
+          - notifier://
+    - name: disk_sink
+      transformers:
+          - name: "rate_of_change"
+            parameters:
+                source:
+                    map_from:
+                        name: "(disk\\.device|disk)\\.(read|write)\\.(bytes|requests)"
+                        unit: "(B|request)"
+                target:
+                    map_to:
+                        name: "\\1.\\2.\\3.rate"
+                        unit: "\\1/s"
+                    type: "gauge"
+      publishers:
+          - notifier://
+    - name: network_sink
+      transformers:
+          - name: "rate_of_change"
+            parameters:
+                source:
+                   map_from:
+                       name: "network\\.(incoming|outgoing)\\.(bytes|packets)"
+                       unit: "(B|packet)"
+                target:
+                    map_to:
+                        name: "network.\\1.\\2.rate"
+                        unit: "\\1/s"
+                    type: "gauge"
+      publishers:
+          - notifier://
diff --git a/roles/nova/templates/nova.conf.j2 b/roles/nova/templates/nova.conf.j2
index 630f7eb..a1db757 100644
--- a/roles/nova/templates/nova.conf.j2
+++ b/roles/nova/templates/nova.conf.j2
@@ -12,6 +12,7 @@ network_api_class = nova.network.neutronv2.api.API
 security_group_api = neutron
 linuxnet_interface_driver = nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
+compute_driver=libvirt.LibvirtDriver
 
 enabled_apis=osapi_compute,metadata