From 7a95d66faf04f9d90705b1525908f29df54b6f3d Mon Sep 17 00:00:00 2001
From: Andrew Woodward <awoodward@mirantis.com>
Date: Mon, 17 Oct 2016 08:53:07 -0700
Subject: [PATCH] Move rbd_default_features to ensure_resources

We are working to land I477640c5db2cc84622da7734fb54cfe7740bd137
which creates a duplicate declration, we should be able to move from create
to ensure resource to minimize this until it lands.

Related_bug: 1633552

Change-Id: I95cafec9160f5c3b1610a0408f2f80d567fcaa89
---
 manifests/ceph.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/ceph.pp b/manifests/ceph.pp
index 2083ce386..6c0d1bb01 100644
--- a/manifests/ceph.pp
+++ b/manifests/ceph.pp
@@ -51,12 +51,18 @@ 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 = {
-    'client/rbd_default_features'         => { value => '15' },
     'global/osd_journal_size'             => { value => '100' },
 
   }
+
   class { '::ceph::conf':
     args => $ceph_extra_config,
   }