From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Oct 2017 13:25:38 +0000 (-0500)
Subject: mgr/localpool: fix rule selection
X-Git-Tag: v13.0.1~682^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7623513935525498640defa2064c291fd69a2b76;p=ceph-ci.git

mgr/localpool: fix rule selection

The 'osd pool create' arg parsing is broken; the rule name for
'ceph osd pool create $name $numpgs replicated $rulename' is passed
via the erasure_code_profile param.  Too many req=false options
without a way to disambiguate them.

Work around it by passing both 'rule' and 'erasure_code_profile'
keys, so that if/when the hack in OSDMonitor.cc is removed it will
still work.  Blech.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/localpool/module.py b/src/pybind/mgr/localpool/module.py
index fac3d1c7f6c..0abdbfbc741 100644
--- a/src/pybind/mgr/localpool/module.py
+++ b/src/pybind/mgr/localpool/module.py
@@ -54,6 +54,7 @@ class Module(MgrModule):
                         "format": "json",
                         "pool": pool_name,
                         'rule': pool_name,
+                        'erasure_code_profile': pool_name,
                         "pool_type": 'replicated',
                         'pg_num': str(pg_num),
                     }), "")