From: Redouane Kachach <rkachach@redhat.com>
Date: Wed, 23 Feb 2022 10:39:40 +0000 (+0100)
Subject: mgr/cephadm: Adding python natsort module
X-Git-Tag: v17.2.1~79^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=933d6cdc4be2980a9eb5601241266cf24a6fdaa4;p=ceph.git

mgr/cephadm: Adding python natsort module
Needed by: https://tracker.ceph.com/issues/54026

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 7e646d99589205633a21e19cbdc11b7999ae5da1)

Conflicts:
	debian/control
---

diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index a9c97a85deb17..4e4a501e69408 100644
--- a/admin/doc-requirements.txt
+++ b/admin/doc-requirements.txt
@@ -16,3 +16,4 @@ typed-ast
 sphinxcontrib-openapi
 sphinxcontrib-seqdiag
 mistune < 2.0.0
+natsort
diff --git a/ceph.spec.in b/ceph.spec.in
index cb3fa2d367740..649247308a79f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -666,6 +666,7 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{python3_pkgversion}-asyncssh
+Requires:       python%{python3_pkgversion}-natsort
 Requires:       cephadm = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?suse_version}
 Requires:       openssh
diff --git a/debian/control b/debian/control
index 2f68285c7ae12..7f97e43882bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -348,7 +348,8 @@ Depends: ceph-mgr (= ${binary:Version}),
          ${python:Depends},
          openssh-client,
          python3-jinja2,
-         python3-cherrypy3
+         python3-cherrypy3,
+         python3-natsort
 Description: cephadm orchestrator module for ceph-mgr
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 3aa1054dbe897..2901e9d193d6d 100644
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -9,3 +9,4 @@ Routes
 prettytable
 pytest
 pyyaml
+natsort
diff --git a/src/pybind/mgr/requirements-required.txt b/src/pybind/mgr/requirements-required.txt
index d71f25a027f47..226425f139202 100644
--- a/src/pybind/mgr/requirements-required.txt
+++ b/src/pybind/mgr/requirements-required.txt
@@ -13,3 +13,4 @@ pyyaml
 requests-mock
 scipy
 werkzeug
+natsort