diff --git a/defaults/main.yml b/defaults/main.yml
index 6a6a20b..55a2b98 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -66,10 +66,11 @@ ceph_mons: []
 #  auth_service_required = cephx
 #  auth_client_required = cephx
 
-# Ceph client usernames for glance and cinder+nova
+# Ceph client usernames for glance, cinder+nova and gnocchi
 glance_ceph_client: glance
 cinder_ceph_client: cinder
 cinder_backup_ceph_client: cinder-backup
+gnocchi_ceph_client: gnocchi
 
 # by default we assume you use rbd for both cinder and nova, and as libvirt
 # needs to access both volumes (cinder) as boot disks (nova) we default to
@@ -93,3 +94,7 @@ ceph_nova_service_names:
 
 ceph_glance_service_names:
   - glance-api
+
+ceph_gnocchi_service_names:
+  - gnocchi-api
+  - gnocchi-metricd
diff --git a/tasks/main.yml b/tasks/main.yml
index 8555455..6e5a9e7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,6 +24,10 @@
         (inventory_hostname in groups['nova_compute']
         and (cinder_backends_rbd_inuse|bool or
         nova_libvirt_images_rbd_pool is defined))
+        or
+        (inventory_hostname in groups['gnocchi_api']
+        and gnocchi_storage_driver is defined
+        and gnocchi_storage_driver == 'ceph')
   tags:
   - ceph-client
 
diff --git a/vars/main.yml b/vars/main.yml
index 16095c6..bc4fb6b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -48,4 +48,10 @@ ceph_components:
     client:
       - '{{ nova_ceph_client }}'
     service: '{{ ceph_nova_service_names }}'
+  - component: gnocchi_api
+    package:
+      - python-ceph
+    client:
+      - '{{ gnocchi_ceph_client }}'
+    service: '{{ ceph_gnocchi_service_names }}'