From 0415a2a82bc1b72570a8e10a6384fc5a9f34b04f Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 18 May 2016 22:26:22 -0400
Subject: Gnocchi composable roles

Implements: blueprint composable-services-within-roles

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Co-Authored-By: Carlos Camacho <ccamacho@redhat.com>

Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d

Closes-Bug: #1601846
Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9
---
 puppet/ceph-cluster-config.yaml | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'puppet/ceph-cluster-config.yaml')

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index 2e329989..db1fd09d 100644
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -5,9 +5,6 @@ parameters:
   NovaRbdPoolName:
     default: vms
     type: string
-  GnocchiRbdPoolName:
-    default: metrics
-    type: string
   CephClientUserName:
     default: openstack
     type: string
@@ -23,21 +20,12 @@ resources:
             ceph_cluster:
               mapped_data:
                 nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
-                gnocchi::storage::ceph::ceph_pool: {get_param: GnocchiRbdPoolName}
-                gnocchi::storage::ceph::ceph_username: {get_param: CephClientUserName}
                 nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}
                 nova::compute::rbd::rbd_keyring:
                   list_join:
                   - '.'
                   - - 'client'
                     - {get_param: CephClientUserName}
-                gnocchi::storage::ceph::ceph_keyring:
-                  list_join:
-                  - '.'
-                  - - '/etc/ceph/ceph'
-                    - 'client'
-                    - {get_param: CephClientUserName}
-                    - 'keyring'
 
 outputs:
   config_id:
-- 
cgit 1.2.3-korg