diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 6197e7673..e4fc8d569 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -81,7 +81,9 @@ class { 'openstack_integration::aodh':
   notification_topics => ['notifications', 'vitrage_notifications'],
 }
 include openstack_integration::vitrage
-include openstack_integration::ceph
+class { 'openstack_integration::ceph':
+  ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
+}
 class { 'openstack_integration::heat':
   notification_topics => ['notifications', 'vitrage_notifications'],
 }
@@ -91,6 +93,7 @@ class { 'openstack_integration::provision':
   image_format => 'raw',
 }
 class { 'openstack_integration::gnocchi':
+  backend            => 'ceph',
   integration_enable => true,
 }
 
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index cfc571e47..f647f0ea2 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -65,6 +65,7 @@ class { 'openstack_integration::nova':
 class { 'openstack_integration::ceph':
   deploy_rgw    => true,
   create_cephfs => true,
+  ceph_pools    => ['glance', 'nova'],
 }
 class { 'openstack_integration::horizon':
   octavia_enabled => true
diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index 50484dfa1..065b232f3 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -13,10 +13,15 @@
 #   (optional) Flag if CephFS will be created.
 #   Defaults to false
 #
+# [*ceph_pools*]
+#   (optional) Ceph pools
+#   Defaults to ['glance', 'nova']
+#
 class openstack_integration::ceph (
   $deploy_rgw    = false,
   $pg_num        = 16,
   $create_cephfs = false,
+  $ceph_pools    = ['glance', 'nova']
 ) {
 
   include openstack_integration::config
@@ -136,7 +141,6 @@ test -b /dev/ceph_vg/lv_data
     rbd_default_features         => '15',
   }
 
-  $ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
   ceph::pool { $ceph_pools:
     pg_num => $pg_num,
   }