cleaned code and added help on these commands

diff --git a/ceph_deploy/hosts/centos/__init__.py b/ceph_deploy/hosts/centos/__init__.py
index d9765234c8cd3b43be9cc5820e99f2c352d18c53..49d1dfc71c477929aadd5ccf4f154f9c9cf87aa1 100644 (file)
--- 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 f82537e50dd55d8eb8af30b3abbd8c58d22e94a2..c35dbb7b6db42b35073e8679c2b49871695e72a0 100644 (file)
--- 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 9f0f2bc73bee64ce96b245c87ca3c04f8d28517e..bdb84051f036c20cede3ee14e45c20b73af7d399 100644 (file)
--- 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 33e19a95f609d6b3f2a133cbd9d8506dfe8893d2..65b125546caec85f48060f346814e2dd7f705643 100644 (file)
--- 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')