From 73e8149cb06a9c79b51fb4f4c3fed67085f590a6 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 30 Jul 2021 11:33:59 -0400
Subject: [PATCH] Remove explicit image-features from rbd cmd

This should be managed in ceph.conf with the `rbd default
features` configuration option instead, and thus can be tailored to the
underlying OS version.
---
 daemon-common/ceph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon-common/ceph.py b/daemon-common/ceph.py
index fb04b732..94936221 100644
--- a/daemon-common/ceph.py
+++ b/daemon-common/ceph.py
@@ -491,7 +491,7 @@ def add_volume(zkhandler, pool, name, size):
         size = '{}B'.format(size)
 
     # 2. Create the volume
-    retcode, stdout, stderr = common.run_os_command('rbd create --size {} --image-feature layering,exclusive-lock {}/{}'.format(size, pool, name))
+    retcode, stdout, stderr = common.run_os_command('rbd create --size {} {}/{}'.format(size, pool, name))
     if retcode:
         return False, 'ERROR: Failed to create RBD volume "{}": {}'.format(name, stderr)