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: v17.1.0~727^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43401%2Fhead;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>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 17b7fcfc333a..a74e27eb4f2d 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6341,6 +6341,7 @@ class YumDnf(Packager):
         'rocky': ('centos', 'el'),
         'almalinux': ('centos', 'el'),
         'fedora': ('fedora', 'fc'),
+        'mariner': ('mariner', 'cm'),
     }
 
     def __init__(self, ctx: CephadmContext,
@@ -6357,6 +6358,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'