mooli tayer has uploaded a new change for review. Change subject: tool: configurator module names optional, defaults to file name. ......................................................................
tool: configurator module names optional, defaults to file name. Change-Id: I5634d98aedabe08a01d74c45a4d8e3f6fd6fe877 Signed-off-by: Mooli Tayer <[email protected]> --- M lib/vdsm/tool/configurator.py M lib/vdsm/tool/configurators/certificates.py M lib/vdsm/tool/configurators/libvirt.py M lib/vdsm/tool/configurators/sanlock.py 4 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/34099/1 diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py index 89404dd..83be809 100644 --- a/lib/vdsm/tool/configurator.py +++ b/lib/vdsm/tool/configurator.py @@ -104,6 +104,8 @@ _CONFIGURATORS = {} for module in _listmodules(configurators): _CONFIGURATORS[module] = _import_module(configurators, module) + if not hasattr(_CONFIGURATORS[module], 'name'): + setattr(_CONFIGURATORS[module], 'name', module) @expose("configure") diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py index 3d79d45..d86ac7a 100644 --- a/lib/vdsm/tool/configurators/certificates.py +++ b/lib/vdsm/tool/configurators/certificates.py @@ -37,8 +37,6 @@ CERT_FILE = os.path.join(PKI_DIR, 'certs/vdsmcert.pem') KEY_FILE = os.path.join(PKI_DIR, 'keys/vdsmkey.pem') -name = "certificates" - def _exec_vdsm_gencerts(): rc, out, err = execCmd( diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index 8e96980..0a96fea 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -47,8 +47,6 @@ from ovirt.node.utils.fs import Config as NodeCfg -name = 'libvirt' - requires = frozenset(('certificates',)) services = ("vdsmd", "supervdsmd", "libvirtd") diff --git a/lib/vdsm/tool/configurators/sanlock.py b/lib/vdsm/tool/configurators/sanlock.py index ec27245..2a831b9 100644 --- a/lib/vdsm/tool/configurators/sanlock.py +++ b/lib/vdsm/tool/configurators/sanlock.py @@ -31,8 +31,6 @@ SANLOCK_GROUPS = (constants.QEMU_PROCESS_GROUP, constants.VDSM_GROUP) -name = 'sanlock' - services = ('sanlock',) -- To view, visit http://gerrit.ovirt.org/34099 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5634d98aedabe08a01d74c45a4d8e3f6fd6fe877 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
