Skip to content

Commit

Permalink
dist: stop installing scylla-tools, scylla-jmx by default
Browse files Browse the repository at this point in the history
Since we added native nodetool, we no longer need to install scylla-tools
and scylla-jmx, drop them from scylla metapackage and make it optional
package.

Closes #18472
  • Loading branch information
syuu1228 committed May 1, 2024
1 parent bd0d246 commit dd07796
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 0 additions & 3 deletions dist/debian/control.template
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ Package: %{product}
Section: metapackages
Architecture: any
Depends: %{product}-server (= ${binary:Version})
, %{product}-jmx (= ${binary:Version})
, %{product}-tools (= ${binary:Version})
, %{product}-tools-core (= ${binary:Version})
, %{product}-kernel-conf (= ${binary:Version})
, %{product}-node-exporter (= ${binary:Version})
, %{product}-cqlsh (= ${binary:Version})
Expand Down
5 changes: 1 addition & 4 deletions dist/redhat/scylla.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ Requires: %{product}-server = %{version}-%{release}
Requires: %{product}-conf = %{version}-%{release}
Requires: %{product}-python3 = %{version}-%{release}
Requires: %{product}-kernel-conf = %{version}-%{release}
Requires: %{product}-jmx = %{version}-%{release}
Requires: %{product}-tools = %{version}-%{release}
Requires: %{product}-tools-core = %{version}-%{release}
Requires: %{product}-node-exporter = %{version}-%{release}
Requires: %{product}-cqlsh = %{version}-%{release}
Obsoletes: scylla-server < 1.1
Expand All @@ -36,7 +33,7 @@ Obsoletes: scylla-server < 1.1
Scylla is a highly scalable, eventually consistent, distributed,
partitioned row DB.
This package installs all required packages for ScyllaDB, including
%{product}-server, %{product}-jmx, %{product}-tools, %{product}-tools-core %{product}-node-exporter.
%{product}-server, %{product}-node-exporter.

# this is needed to prevent python compilation error on CentOS (#2235)
%if 0%{?rhel}
Expand Down

0 comments on commit dd07796

Please sign in to comment.