summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-03-27 16:13:59 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-03-27 18:36:10 -0400
commitb0fea9137191704f0763cf2fd892570ec560fce9 (patch)
tree416120c1750d9dc9bd44be421785c4617dc8a82e /puppet/hieradata
parentfed9d001ccc92a6d3392cb959416596b6df83d99 (diff)
Restructure Ceph/Puppet params to reflect changes in puppet-ceph
A change [1] in puppet-ceph offers more flexibility but breaks backwards so we had to update our composition layer as well; we gain control of the cephx keyring in the template though. 1. Ie6adbd601388ab52c37037004bd0ceef9fc41942 Change-Id: Ia8196849afce2969daa608828cec81ebe3ac96e1
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/ceph.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index a908b43b..e43b0da5 100644
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -6,8 +6,6 @@ ceph::profile::params::osd_pool_default_min_size: 1
ceph::profile::params::manage_repo: false
ceph::profile::params::authentication_type: cephx
-ceph_openstack_default_cap_mon: 'allow r'
-ceph_openstack_default_cap_osd: 'allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=vms'
ceph_pools:
- volumes
- vms