From: Kefu Chai <kchai@redhat.com>
Date: Fri, 21 Feb 2020 11:38:33 +0000 (+0800)
Subject: Merge pull request #33435 from tchaikov/wip-viva-la-module
X-Git-Tag: v15.1.1~332
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=659b09a04da1eea9bbee340b51b71ab3855ffd6d;p=ceph-ci.git

Merge pull request #33435 from tchaikov/wip-viva-la-module

deb,rpm,doc: s/plugin/module/

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

659b09a04da1eea9bbee340b51b71ab3855ffd6d
diff --cc ceph.spec.in
index 0c88f261846,0dffe719b30..ecf33da8095
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -570,46 -583,12 +570,46 @@@ Requires:       python2-grpci
  Requires:       python2-protobuf
  %endif
  %description mgr-diskprediction-cloud
- ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict
+ ceph-mgr-diskprediction-cloud is a ceph-mgr module that tries to predict
  disk failures using services in the Google cloud.
  
 +%package mgr-modules-core
 +Summary:        Ceph Manager modules which are always enabled
 +BuildArch:      noarch
 +%if 0%{?suse_version}
 +Group:          System/Filesystems
 +%endif
 +%if 0%{?rhel} == 7
 +Requires:       python%{python3_version_nodots}-bcrypt
 +Requires:       python%{python3_version_nodots}-pyOpenSSL
 +Requires:       python%{python3_version_nodots}-requests
 +Requires:       python%{python3_version_nodots}-PyYAML
 +%else
 +Requires:       python%{python3_pkgversion}-bcrypt
 +Requires:       python%{python3_pkgversion}-pecan
 +Requires:       python%{python3_pkgversion}-pyOpenSSL
 +Requires:       python%{python3_pkgversion}-requests
 +%endif
 +%if 0%{?fedora} || 0%{?rhel} >= 8
 +Requires:       python%{python3_pkgversion}-cherrypy
 +Requires:       python%{python3_pkgversion}-pyyaml
 +Requires:       python%{python3_pkgversion}-werkzeug
 +%endif
 +%if 0%{?suse_version}
 +Requires:       python%{python3_pkgversion}-CherryPy
 +Requires:       python%{python3_pkgversion}-PyYAML
 +Requires:       python%{python3_pkgversion}-Werkzeug
 +%endif
 +%if 0%{?weak_deps}
 +Recommends:	ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
 +%endif
 +%description mgr-modules-core
 +ceph-mgr-modules-core provides a set of modules which are always
 +enabled by ceph-mgr.
 +
  %package mgr-rook
  BuildArch:      noarch
- Summary:        Ceph Manager plugin for Rook-based orchestration
+ Summary:        Ceph Manager module for Rook-based orchestration
  %if 0%{?suse_version}
  Group:          System/Filesystems
  %endif
diff --cc debian/control
index c4cdb806f7a,acb89afec8a..3b606a17a0b
--- a/debian/control
+++ b/debian/control
@@@ -291,23 -291,9 +291,23 @@@ Description: diskprediction-cloud modul
   storage system that runs on commodity hardware and delivers object,
   block and file system storage.
   .
-  This package contains the diskprediction_cloud plugin for the ceph-mgr
+  This package contains the diskprediction_cloud module for the ceph-mgr
   daemon, which helps predict disk failures.
  
 +Package: ceph-mgr-modules-core
 +Architecture: all
 +Depends: ${misc:Depends},
 +         ${python:Depends},
 +         ${shlibs:Depends},
 +Recommends: ceph-mgr-rook
 +Description: ceph manager modules which are always enabled
 + Ceph is a massively scalable, open-source, distributed
 + storage system that runs on commodity hardware and delivers object,
 + block and file system storage.
 + .
 + This package contains a set of core ceph-mgr modules which are always
 + enabled.
 +
  Package: ceph-mgr-rook
  Architecture: all
  Depends: ceph-mgr (= ${binary:Version}),