summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-02 07:33:08 +0000
committerGerrit Code Review <review@openstack.org>2015-04-02 07:33:08 +0000
commit61fecfc5754c3d08e38853782fdb875d1156e3b3 (patch)
tree38af04f52f4f1072f09c51fafd3766ae654c74ea /puppet/hieradata
parent9bf344f4786e343f5670addf3819c87cf2bc484d (diff)
parentb0fea9137191704f0763cf2fd892570ec560fce9 (diff)
Merge "Restructure Ceph/Puppet params to reflect changes in puppet-ceph"
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