diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index 34b37375..004756e3 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -41,6 +41,7 @@ class cloud::compute::hypervisor(
 ) {
 
   include 'cloud::compute'
+  include 'cloud::telemetry'
 
   exec { 'insert_module_nbd':
     command => '/bin/echo "nbd" > /etc/modules',
@@ -131,4 +132,6 @@ Host *
     Exec <<| tag == 'set_secret_value_virsh' |>>
   }
 
+  class { 'ceilometer::agent::compute': }
+
 }
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index 5a0045d1..e7e0680a 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/spec/classes/cloud_compute_hypervisor_spec.rb
@@ -38,7 +38,19 @@ describe 'cloud::compute::hypervisor' do
         neutron_endpoint        => '10.0.0.1',
         neutron_region_name     => 'MyRegion',
         neutron_password        => 'secrete',
-        log_facility            => 'LOG_LOCAL0' }"
+        log_facility            => 'LOG_LOCAL0' }
+       class { 'cloud::telemetry':
+        ceilometer_secret          => 'secrete',
+        rabbit_hosts               => ['10.0.0.1'],
+        rabbit_password            => 'secrete',
+        ks_keystone_internal_host  => '10.0.0.1',
+        ks_keystone_internal_port  => '5000',
+        ks_keystone_internal_proto => 'http',
+        ks_ceilometer_password     => 'secrete',
+        log_facility               => 'LOG_LOCAL0',
+        use_syslog                 => true,
+        verbose                    => true,
+        debug                      => true }"
     end
 
     let :params do
@@ -77,6 +89,23 @@ describe 'cloud::compute::hypervisor' do
           :neutron_admin_auth_url => 'http://10.0.0.1:35357/v2.0',
           :neutron_region_name    => 'MyRegion',
           :neutron_url            => 'http://10.0.0.1:9696'
+      )
+    end
+
+    it 'configure ceilometer common' do
+      should contain_class('ceilometer').with(
+          :verbose                 => true,
+          :debug                   => true,
+          :rabbit_userid           => 'ceilometer',
+          :rabbit_hosts            => ['10.0.0.1'],
+          :rabbit_password         => 'secrete',
+          :metering_secret         => 'secrete',
+          :use_syslog              => true,
+          :log_facility            => 'LOG_LOCAL0'
+        )
+      should contain_class('ceilometer::agent::auth').with(
+          :auth_password => 'secrete',
+          :auth_url      => 'http://10.0.0.1:5000/v2.0'
         )
     end
 
@@ -123,6 +152,10 @@ describe 'cloud::compute::hypervisor' do
       should contain_class('nova::compute::neutron')
     end
 
+    it 'configure ceilometer agent compute' do
+      should contain_class('ceilometer::agent::compute')
+    end
+
     it 'configure nova-conpute to support RBD backend' do
       should contain_nova_config('DEFAULT/libvirt_images_type').with('value' => 'rbd')
       should contain_nova_config('DEFAULT/libvirt_images_rbd_pool').with('value' => 'cinder')