]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: Allow customizing mgr/cephadm/lsmcli_blink_lights_cmd per host
authorVolker Theile <vtheile@suse.com>
Fri, 30 Oct 2020 08:22:30 +0000 (09:22 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 18 Nov 2020 10:52:33 +0000 (11:52 +0100)
commitfe8385a482b606fe94ac0872ba7306220d858803
treebeccd933e31d2e8ee5be5a2a2228b5ed68740993
parentf3676ece6dfaede3efff94e49ef143a4eb488320
mgr/cephadm: Allow customizing mgr/cephadm/lsmcli_blink_lights_cmd per host

* Rename key name from 'lsmcli_blink_lights_cmd' to 'blink_device_light_cmd'
* Refactor TemplateMgr::render() method to use the Ceph common behavior how to name store/module option keys. The old implementation required a key like 'mgr/cephadm/services_nfs_ganesha.conf' instead of 'mgr/cephadm/services/nfs/ganesha.conf' or 'mgr/cephadm/mgr0_blink_device_light_cmd' instead of 'mgr/cephadm/mgr0/blink_device_light_cmd'.

Fixes: https://tracker.ceph.com/issues/48041
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit cd79c9912ab35ee6296d613edc7830410a141e05)

Conflicts:
doc/rados/operations/devices.rst
doc/rados/operations/devices.rst
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/template.py
src/pybind/mgr/cephadm/templates/blink_device_light_cmd.j2 [new file with mode: 0644]
src/pybind/mgr/cephadm/templates/lsmcli_blink_lights_cmd.j2 [deleted file]
src/pybind/mgr/cephadm/tests/test_cephadm.py