Use already Deployed/Installed servers

[apex-tripleo-heat-templates.git] / puppet / ceph-cluster-config.yaml

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index dab029f..2e32998 100644 (file)
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -1,20 +1,16 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Ceph Cluster config data for Puppet'
 
 parameters:
-  ceph_fsid:
-    default: ''
+  NovaRbdPoolName:
+    default: vms
     type: string
-  ceph_admin_key:
-    default: ''
+  GnocchiRbdPoolName:
+    default: metrics
     type: string
-  ceph_mon_key:
-    default: ''
+  CephClientUserName:
+    default: openstack
     type: string
-  ceph_mon_names:
-    type: comma_delimited_list
-  ceph_mon_ips:
-    type: comma_delimited_list
 
 resources:
   CephClusterConfigImpl:
@@ -26,20 +22,22 @@ resources:
           datafiles:
             ceph_cluster:
               mapped_data:
-                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::admin_key: {get_param: ceph_admin_key}
-                ceph::profile::params::mon_key: {get_param: ceph_mon_key}
-                # We would need a dedicated key for OSD
-                ceph::profile::params::bootstrap_osd_key: {get_param: ceph_mon_key}
-                ceph::profile::params::osds: '{"/srv/data": {}}'
+                  - '.'
+                  - - '/etc/ceph/ceph'
+                    - 'client'
+                    - {get_param: CephClientUserName}
+                    - 'keyring'
 
 outputs:
   config_id: