openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Move rbd_default_features to ensure_resources"

Browse Source
This commit is contained in:
Jenkins
2016-10-28 10:05:57 +00:00
committed by Gerrit Code Review
parent 8a2b8f0326 7a95d66faf
commit c7920d977e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/ceph.pp
View File

@@ -51,12 +51,18 @@ class openstack_integration::ceph {
class { '::ceph::profile::mon': } class { '::ceph::profile::mon': }
class { '::ceph::profile::osd': } class { '::ceph::profile::osd': }
# Needed until https://review.openstack.org/#/c/283359 lands
$ceph_migration_config = {
'client/rbd_default_features' => { value => '15' },
}
ensure_resources(ceph_config, $ceph_migration_config)
# Extra Ceph configuration to increase performances # Extra Ceph configuration to increase performances
$ceph_extra_config = { $ceph_extra_config = {
'client/rbd_default_features' => { value => '15' },
'global/osd_journal_size' => { value => '100' }, 'global/osd_journal_size' => { value => '100' },
} }
class { '::ceph::conf': class { '::ceph::conf':
args => $ceph_extra_config, args => $ceph_extra_config,
} }