From: Roaa Sakr <romoh@microsoft.com>
Date: Fri, 1 Oct 2021 22:40:11 +0000 (-0700)
Subject: src/cephadm: Add mariner as a supported distro.
X-Git-Tag: v16.2.7~67^2~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd323d489413050ecdf56fcda1a431154bc2616a;p=ceph.git

src/cephadm: Add mariner as a supported distro.

Using cephadm install commands on Mariner will result in an error
"Distro not supported" though the packages are supported and can be
installed manually. This patch adds mariner as a supported distro.
Fix validated on mariner.

Signed-off-by: Roaa Sakr <romoh@microsoft.com>
(cherry picked from commit 1612427ea549d3fc259c8eb0e37953a9323dcb31)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index b257befdaf2d..7e367993ec70 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6109,6 +6109,7 @@ class YumDnf(Packager):
         'rocky': ('centos', 'el'),
         'almalinux': ('centos', 'el'),
         'fedora': ('fedora', 'fc'),
+        'mariner': ('mariner', 'cm'),
     }
 
     def __init__(self, ctx: CephadmContext,
@@ -6125,6 +6126,8 @@ class YumDnf(Packager):
         if (self.distro_code == 'fc' and self.major >= 30) or \
            (self.distro_code == 'el' and self.major >= 8):
             self.tool = 'dnf'
+        elif (self.distro_code == 'cm'):
+            self.tool = 'tdnf'
         else:
             self.tool = 'yum'