Skip to content

Commit 3dd1b62

Browse files
committed
Dev: Drop cluster-glue in multiple places (jsc#PED-8733)
1 parent 794caa1 commit 3dd1b62

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

crmsh.spec.in

-5
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ Requires(post): python3-dateutil
117117
Requires(post): python3-tox
118118
Requires(post): pacemaker
119119
BuildArch: noarch
120-
%if 0%{?suse_version}
121-
Requires(post): libglue-devel
122-
%else
123-
Requires(post): cluster-glue-libs-devel
124-
%endif
125120
Requires(post): python3-PyYAML
126121
%endif
127122

crmsh/report/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
2929
"""
3030

31-
PACKAGES = "booth cluster-glue cluster-glue-libs corosync corosync-qdevice corosync-qnetd corosync-testagents crmsh crmsh-scripts csync2 doxygen2man drbd-utils gfs2-kmp-default gfs2-utils hawk-apiserver ldirectord libcfg6 libcmap4 libcorosync_common4 libcpg4 libdlm libdlm3 libqb-tools libqb100 libquorum5 libsam4 libtotem_pg5 libvotequorum8 linstor linstor-common linstor-controller linstor-satellite monitoring-plugins-metadata o2locktop ocfs2-tools ocfs2-tools-o2cb omping pacemaker pacemaker-cli pacemaker-cts pacemaker-libs pacemaker-remote pacemaker-schemas patterns-ha pssh python-pssh python3-linstor python3-linstor-client python3-pacemaker python3-parallax resource-agents resource-agents-zfs ruby2.5-rubygem-sass-listen ruby2.5-rubygem-sass-listen-doc sbd"
31+
PACKAGES = "booth corosync corosync-qdevice corosync-qnetd corosync-testagents crmsh crmsh-scripts csync2 doxygen2man drbd-utils gfs2-kmp-default gfs2-utils hawk-apiserver ldirectord libcfg6 libcmap4 libcorosync_common4 libcpg4 libdlm libdlm3 libqb-tools libqb100 libquorum5 libsam4 libtotem_pg5 libvotequorum8 linstor linstor-common linstor-controller linstor-satellite monitoring-plugins-metadata o2locktop ocfs2-tools ocfs2-tools-o2cb omping pacemaker pacemaker-cli pacemaker-cts pacemaker-libs pacemaker-remote pacemaker-schemas patterns-ha pssh python-pssh python3-linstor python3-linstor-client python3-pacemaker python3-parallax resource-agents resource-agents-zfs ruby2.5-rubygem-sass-listen ruby2.5-rubygem-sass-listen-doc sbd"
3232

3333
ANALYSIS_F = "analysis.txt"
3434
COREDUMP_F = "coredump_info.txt"

doc/website-v1/development.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ and call:
6161

6262
`crmsh` also comes with a comprehensive regression test suite. The regression tests need
6363
to run after installation, on a system which has both crmsh and pacemaker installed. You
64-
will also need to install +pacemaker+ and the +cluster-glue+ development headers.
64+
will also need to install +pacemaker+ development headers.
6565

66-
* link:http://hg.linux-ha.org/glue[cluster-glue]
6766
* link:https://github.com/ClusterLabs/pacemaker[pacemaker]
6867

6968
To execute the tests, call:

scripts/health/collect.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
data = crm_script.get_input()
1616

17-
PACKAGES = ['booth', 'cluster-glue', 'corosync', 'crmsh', 'csync2', 'drbd',
17+
PACKAGES = ['booth', 'corosync', 'crmsh', 'csync2', 'drbd',
1818
'fence-agents', 'gfs2', 'gfs2-utils', 'ha-cluster-bootstrap',
1919
'haproxy', 'hawk', 'libdlm', 'libqb', 'ocfs2', 'ocfs2-tools',
20-
'pacemaker', 'pacemaker-mgmt', 'resource-agents', 'sbd']
20+
'pacemaker', 'resource-agents', 'sbd']
2121

2222

2323
def rpm_info():

utils/crm_init.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import socket
66
import crm_script
77

8-
PACKAGES = ['booth', 'cluster-glue', 'corosync', 'crmsh', 'csync2', 'drbd',
8+
PACKAGES = ['booth', 'corosync', 'crmsh', 'csync2', 'drbd',
99
'fence-agents', 'gfs2', 'gfs2-utils', 'hawk', 'ocfs2',
10-
'ocfs2-tools', 'pacemaker', 'pacemaker-mgmt',
10+
'ocfs2-tools', 'pacemaker',
1111
'resource-agents', 'sbd']
1212
SERVICES = ['sshd', 'ntp', 'corosync', 'pacemaker', 'hawk']
1313
SSH_KEY = os.path.expanduser('~/.ssh/id_rsa')

0 commit comments

Comments
 (0)