X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fceph-cluster-config.yaml;h=2e329989f1d9b29742b52b4797d59d3ca373c71c;hb=c8251708d7368b8b1fe236b01684f3d517fdd8d7;hp=5e54a621b2d465a5a079925cf4e6c3fba70f6ecc;hpb=ac680bff5f8ece671686b7ebffa22eaf17b43474;p=apex-tripleo-heat-templates.git

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index 5e54a621..2e329989 100644
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -2,39 +2,14 @@ heat_template_version: 2015-04-30
 description: 'Ceph Cluster config data for Puppet'
 
 parameters:
-  ceph_storage_count:
-    default: 0
-    type: number
-    description: Number of Ceph storage nodes. Used to enable/disable managed Ceph installation.
-  ceph_external_mon_ips:
-    default: ''
-    type: string
-    description: List of external Ceph Mon host IPs.
-  ceph_client_key:
-    default: ''
-    type: string
-    description: Ceph key used to create the 'openstack' user keyring.
-  ceph_fsid:
-    default: ''
-    type: string
-  ceph_admin_key:
-    default: ''
-    type: string
-  ceph_mon_key:
-    default: ''
-    type: string
-  ceph_mon_names:
-    type: comma_delimited_list
-  ceph_mon_ips:
-    type: comma_delimited_list
   NovaRbdPoolName:
     default: vms
     type: string
-  CinderRbdPoolName:
-    default: volumes
+  GnocchiRbdPoolName:
+    default: metrics
     type: string
-  GlanceRbdPoolName:
-    default: images
+  CephClientUserName:
+    default: openstack
     type: string
 
 resources:
@@ -47,52 +22,22 @@ resources:
           datafiles:
             ceph_cluster:
               mapped_data:
-                ceph_storage_count: {get_param: ceph_storage_count}
-                ceph_mon_initial_members:
+                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:
-                  - ','
-                  - {get_param: ceph_mon_names}
-                ceph::profile::params::mon_host:
+                  - '.'
+                  - - 'client'
+                    - {get_param: CephClientUserName}
+                gnocchi::storage::ceph::ceph_keyring:
                   list_join:
-                  - ','
-                  - {get_param: ceph_mon_ips}
-                ceph::profile::params::fsid: {get_param: ceph_fsid}
-                ceph::profile::params::mon_key: {get_param: ceph_mon_key}
-                # We should use a separated key for the non-admin clients
-                ceph::profile::params::client_keys:
-                  str_replace:
-                    template: "{
-                      client.admin: {
-                        secret: 'ADMIN_KEY',
-                        mode: '0600',
-                        cap_mon: 'allow *',
-                        cap_osd: 'allow *',
-                        cap_mds: 'allow *'
-                      },
-                      client.bootstrap-osd: {
-                        secret: 'ADMIN_KEY',
-                        keyring_path: '/var/lib/ceph/bootstrap-osd/ceph.keyring',
-                        cap_mon: 'allow profile bootstrap-osd'
-                      },
-                      client.openstack: {
-                        secret: 'ADMIN_KEY',
-                        mode: '0644',
-                        cap_mon: 'allow r',
-                        cap_osd: 'allow class-read object_prefix rbd_children, allow rwx pool=CINDER_POOL, allow rwx pool=NOVA_POOL, allow rwx pool=GLANCE_POOL'
-                      }
-                    }"
-                    params:
-                      ADMIN_KEY: {get_param: ceph_admin_key}
-                      NOVA_POOL: {get_param: NovaRbdPoolName}
-                      CINDER_POOL: {get_param: CinderRbdPoolName}
-                      GLANCE_POOL: {get_param: GlanceRbdPoolName}
-                nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
-                cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
-                glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
-                ceph_pools:
-                  - {get_param: CinderRbdPoolName}
-                  - {get_param: NovaRbdPoolName}
-                  - {get_param: GlanceRbdPoolName}
+                  - '.'
+                  - - '/etc/ceph/ceph'
+                    - 'client'
+                    - {get_param: CephClientUserName}
+                    - 'keyring'
 
 outputs:
   config_id: