From: Owen Synge <osynge@suse.com>
Date: Fri, 11 Jul 2014 13:47:15 +0000 (+0200)
Subject: cleaned code and added help on these commands
X-Git-Tag: v1.5.9~4^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2f1eaa57aafee945809bac7408000506c2cd390;p=ceph-deploy.git

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 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')