From e2f1eaa57aafee945809bac7408000506c2cd390 Mon Sep 17 00:00:00 2001 From: Owen Synge Date: Fri, 11 Jul 2014 15:47:15 +0200 Subject: [PATCH] cleaned code and added help on these commands --- ceph_deploy/hosts/centos/__init__.py | 7 ++++++- ceph_deploy/hosts/debian/__init__.py | 7 ++++++- ceph_deploy/hosts/fedora/__init__.py | 5 +++++ ceph_deploy/hosts/suse/__init__.py | 12 +++++++----- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ceph_deploy/hosts/centos/__init__.py b/ceph_deploy/hosts/centos/__init__.py index d976523..49d1dfc 100644 --- a/ceph_deploy/hosts/centos/__init__.py +++ b/ceph_deploy/hosts/centos/__init__.py @@ -10,5 +10,10 @@ distro = None release = None codename = None -def choose_init(): +def choose_init(): + """ + Select a init system + + Returns the name of a init system (upstart, sysvinit ...). + """ return 'sysvinit' diff --git a/ceph_deploy/hosts/debian/__init__.py b/ceph_deploy/hosts/debian/__init__.py index f82537e..c35dbb7 100644 --- a/ceph_deploy/hosts/debian/__init__.py +++ b/ceph_deploy/hosts/debian/__init__.py @@ -10,7 +10,12 @@ distro = None release = None codename = None -def choose_init(): +def choose_init(): + """ + Select a init system + + Returns the name of a init system (upstart, sysvinit ...). + """ if distro == 'Ubuntu': return 'upstart' return 'sysvinit' diff --git a/ceph_deploy/hosts/fedora/__init__.py b/ceph_deploy/hosts/fedora/__init__.py index 9f0f2bc..bdb8405 100644 --- a/ceph_deploy/hosts/fedora/__init__.py +++ b/ceph_deploy/hosts/fedora/__init__.py @@ -12,4 +12,9 @@ release = None codename = None def choose_init(): + """ + Select a init system + + Returns the name of a init system (upstart, sysvinit ...). + """ return 'sysvinit' diff --git a/ceph_deploy/hosts/suse/__init__.py b/ceph_deploy/hosts/suse/__init__.py index 33e19a9..65b1255 100644 --- a/ceph_deploy/hosts/suse/__init__.py +++ b/ceph_deploy/hosts/suse/__init__.py @@ -14,11 +14,13 @@ release = None codename = None def choose_init(): - initMapping = { '11' : 'sysvinit', # SLE_11 + """ + Select a init system + + Returns the name of a init system (upstart, sysvinit ...). + """ + init_mapping = { '11' : 'sysvinit', # SLE_11 '12' : 'systemd', # SLE_12 '13.1' : 'systemd', # openSUSE_13.1 } - if release in initMapping: - log.debug("init=%s" % (initMapping[release])) - return initMapping[release] - return 'sysvinit' + return init_mapping.get(release, 'sysvinit') -- 2.47.3