ceph-manager: fix ec_pool parameters

* the crush ruleset and the pool create parameters must be identicals
  k=2 m= 1
* the --property argument is invalid
* the failure domain is ignored on pool create

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

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 52e4fdbb57e4af8584a4ba76779048c2282c7f11..5758f970c3176cbe75125d10d3e5d0cde48f74e1 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', '--property', 'erasure-code-ruleset-failure-domain=osd', '--property', 'erasure-code-m=2', '--property', 'erasure-code-k=1')
+                self.raw_cluster_cmd('osd', 'crush', 'rule', 'create-erasure', 'erasure2', 'erasure-code-ruleset-failure-domain=osd', 'erasure-code-m=2', 'erasure-code-k=1')
 
             if ec_pool:
-                self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'crush_ruleset=erasure2', '--property', 'erasure-code-ruleset-failure-domain=osd', '--property', 'erasure-code-m=2', '--property', 'erasure-code-k=2')
+                self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'crush_ruleset=erasure2', 'erasure-code-m=2', 'erasure-code-k=1')
             else:
                 self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num))
             self.pools[pool_name] = pg_num