]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
python-common: clean-up ServiceSpec.service_id handling
authorMichael Fritch <mfritch@suse.com>
Tue, 30 Jun 2020 22:06:20 +0000 (16:06 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 4 Aug 2020 14:13:29 +0000 (16:13 +0200)
commit55b61dce6347fb65dd1f942211c19eba8984e7ca
tree2938dd3b2bbac5acd77a2240cab2dfd0cb3c163e
parentc6a9704d461bcbb5281d522338bceb56e42eec0a
python-common: clean-up ServiceSpec.service_id handling

service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

Fixes: https://tracker.ceph.com/issues/46175
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit eecc8fcbcc2ee88e4c873579c69f2012dac8c652)
src/pybind/mgr/orchestrator/_interface.py
src/python-common/ceph/deployment/service_spec.py
src/python-common/ceph/tests/test_service_spec.py