diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-02 07:33:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-02 07:33:08 +0000 |
| commit | 61fecfc5754c3d08e38853782fdb875d1156e3b3 (patch) | |
| tree | 38af04f52f4f1072f09c51fafd3766ae654c74ea /puppet/ceph-cluster-config.yaml | |
| parent | 9bf344f4786e343f5670addf3819c87cf2bc484d (diff) | |
| parent | b0fea9137191704f0763cf2fd892570ec560fce9 (diff) | |
Merge "Restructure Ceph/Puppet params to reflect changes in puppet-ceph"
Diffstat (limited to 'puppet/ceph-cluster-config.yaml')
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml index dab029f3..e01bd19d 100644 --- a/puppet/ceph-cluster-config.yaml +++ b/puppet/ceph-cluster-config.yaml @@ -35,11 +35,33 @@ resources: - ',' - {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": {}}' + ceph::profile::params::osds: "{/srv/data: {}}" + # 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=volumes, allow rwx pool=vms' + } + }" + params: + ADMIN_KEY: {get_param: ceph_admin_key} outputs: config_id: |