Fix SUSE Tumbleweed detection and cloud repo enablement.

coriolis/osmorphing/osdetect/suse.py

@@ -31,14 +31,18 @@ class SUSEOSDetectTools(base.BaseLinuxOSDetectTools):
         name = os_release.get("NAME")
         if name and (name == "SLES" or name.startswith("openSUSE")):
             distro_name = None
+            friendly_release_name = name
             if name == "SLES":
                 distro_name = SLES_DISTRO_IDENTIFIER
             elif name.lower().startswith("opensuse"):
                 distro_name = OPENSUSE_DISTRO_IDENTIFIER
             version = os_release.get(
                 "VERSION_ID", constants.OS_TYPE_UNKNOWN)
-            if 'tumbleweed' in distro_name.lower():
+            if 'tumbleweed' in name.lower():
                 version = OPENSUSE_TUMBLEWEED_VERSION_IDENTIFIER
+            else:
+                friendly_release_name = "%s %s" % (
+                    distro_name, version)
 
             if distro_name:
                 info = {
@@ -46,7 +50,7 @@ class SUSEOSDetectTools(base.BaseLinuxOSDetectTools):
                     "distribution_name": distro_name,
                     DETECTED_SUSE_RELEASE_FIELD_NAME: name,
                     "release_version": version,
-                    "friendly_release_name": name}
+                    "friendly_release_name": friendly_release_name}
 
         # NOTE: should be redundant as all SUSEs which have a
         # SuSE-release but no os-release have been deprecated

coriolis/osmorphing/suse.py

@@ -128,7 +128,8 @@ class BaseSUSEMorphingTools(base.BaseLinuxOSMorphingTools):
 
     def _add_cloud_tools_repo(self):
         repo_suffix = ""
-        if self._version:
+        if self._version != (
+                OPENSUSE_TUMBLEWEED_VERSION_IDENTIFIER):
             repo_suffix = "_%s" % self._version
         repo = "obs://Cloud:Tools/%s%s" % (
             self._detected_os_info[DETECTED_SUSE_RELEASE_FIELD_NAME].replace(