From d8076c256e53a7a8b30691cafa1290e73230b042 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Fri, 13 Jan 2017 17:33:22 +0000 Subject: [PATCH] Remove rbd_default_features so puppet-ceph can mange it Remove the client/rbd_default_features resource from this module so that the puppet-ceph module can manage it instead as per I477640c5db2cc84622da7734fb54cfe7740bd137. This change was anticpated as per I95cafec9160f5c3b1610a0408f2f80d567fcaa89. Change-Id: I3242cfe0f141fe2bbb951ce2cf7071fd07456db8 Related-Bug: 1633552 --- manifests/ceph.pp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manifests/ceph.pp b/manifests/ceph.pp index fbdae4a85..c021be561 100644 --- a/manifests/ceph.pp +++ b/manifests/ceph.pp @@ -71,12 +71,6 @@ class openstack_integration::ceph ( class { '::ceph::profile::mon': } 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 $ceph_extra_config = { 'global/osd_journal_size' => { value => '100' },