ceph_manager: update ec_pool creation parameters

As of https://github.com/ceph/ceph/pull/1477 the erasure code parameters
are controled via the osd erasure-code-profile set command instead of
being inlined and duplicated in the crush ruleset creation and the pool
creation. There is no need to create the crush ruleset, it is done
implicitly.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template
index ee8050edf3d6e110709c83e1e09727a0c9da5582..4a02e8e9ff43f5564dc78dfc1a65f19717d2ebb1 100644 (file)
--- a/teuthology/ceph.conf.template
+++ b/teuthology/ceph.conf.template
@@ -18,7 +18,7 @@
 
        mon osd allow primary affinity = true
 
-        osd pool default erasure code properties = "erasure-code-plugin=jerasure erasure-code-technique=reed_sol_van erasure-code-k=2 erasure-code-m=1 erasure-code-ruleset-failure-domain=osd"
+        osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd"
 
 [osd]
         osd journal size = 100

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 82dbc1343d078b9dce2f34767f324a8012a52a95..992d8712d31a829c51190cb83fa65f352ad9454e 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -705,10 +705,10 @@ class CephManager:
             self.log("creating pool_name %s"%(pool_name,))
             if ec_pool and not self.created_erasure_pool:
                 self.created_erasure_pool = True
-                self.raw_cluster_cmd('osd', 'crush', 'rule', 'create-erasure', 'erasure2', 'erasure-code-ruleset-failure-domain=osd', 'erasure-code-m=1', 'erasure-code-k=2')
+                self.raw_cluster_cmd('osd', 'erasure-code-profile', 'set', 'teuthologyprofile', 'ruleset-failure-domain=osd', 'm=1', 'k=2')
 
             if ec_pool:
-                self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'crush_ruleset=erasure2', 'erasure-code-m=1', 'erasure-code-k=2')
+                self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'teuthologyprofile')
             else:
                 self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num))
             self.pools[pool_name] = pg_num