From 9d254451941c2c94a8bfdab2232d97ff1f1f5c86 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 22 Feb 2016 22:00:35 -0500
Subject: [PATCH] scenario001: deploy Gnocchi with RBD backend

After Glance, Nova, Cinder, now we want to deploy Gnocchi with Ceph
backend instead of file.

Change-Id: I1f8c83da9d3dfcee597cec7643ebc0e09ecea30d
---
 README.md            | 2 +-
 manifests/ceph.pp    | 4 ++--
 manifests/gnocchi.pp | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 24e10f31f..f6839a7d1 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ scenario](#All-In-One).
 | cinder     |     rbd     |     iscsi   |     iscsi   |
 | ceilometer |      X      |             |             |
 | aodh       |      X      |             |             |
-| gnocchi    |      X      |             |             |
+| gnocchi    |     rbd     |             |             |
 | heat       |             |       X     |             |
 | swift      |             |       X     |             |
 | sahara     |             |       X     |             |
diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index fc3b8c03a..9bbffdff9 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -25,7 +25,7 @@ class openstack_integration::ceph {
         'secret'  => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==',
         'mode'    => '0644',
         'cap_mon' => 'allow r',
-        'cap_osd' => 'allow class-read object_prefix rbd_children, allow rwx pool=cinder, allow rwx pool=nova, allow rwx pool=glance',
+        'cap_osd' => 'allow class-read object_prefix rbd_children, allow rwx pool=cinder, allow rwx pool=nova, allow rwx pool=glance, allow rwx pool=gnocchi',
       },
     },
     osds                      => {
@@ -33,7 +33,7 @@ class openstack_integration::ceph {
     },
   }
 
-  $ceph_pools = ['glance', 'nova', 'cinder']
+  $ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi']
   ceph::pool { $ceph_pools: }
 
   class { '::ceph::profile::mon': }
diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp
index 21b4a8ca2..70f67ed87 100644
--- a/manifests/gnocchi.pp
+++ b/manifests/gnocchi.pp
@@ -29,7 +29,12 @@ class openstack_integration::gnocchi {
     class { '::gnocchi::db::sync': }
     class { '::gnocchi::metricd': }
     class { '::gnocchi::storage': }
-    class { '::gnocchi::storage::file': }
+    class { '::gnocchi::storage::ceph':
+      ceph_username => 'openstack',
+      ceph_keyring  => '/etc/ceph/ceph.client.openstack.keyring',
+    }
+    # make sure ceph pool exists before running gnocchi (dbsync & services)
+    Exec['create-gnocchi'] -> Exec['gnocchi-db-sync']
     class { '::gnocchi::statsd':
       archive_policy_name => 'high',
       flush_delay         => '100',