python-common/ceph/deployment: RGWSpec: accept (and drop) subcluster arg

This is just so we can load up a stored spec after upgrade.  We'll silently
drop it, since we have the service_id, and this was only used to generate
that anyway.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d35e1d791bedd8d2ed48a456fd1f5bba978f7f37)

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 3af3fb632a8168ef07f92d813712562b96f63b11..d619bb547895990f8399659f64f2c31083d399a3 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -664,6 +664,7 @@ class RGWSpec(ServiceSpec):
                  ssl: bool = False,
                  preview_only: bool = False,
                  config: Optional[Dict[str, str]] = None,
+                 subcluster: Optional[str] = None,  # legacy, only for from_json on upgrade
                  ):
         assert service_type == 'rgw', service_type
         super(RGWSpec, self).__init__(