Skip to content

Commit 63bc5a8

Browse files
authored
packaging: consolidate suse15 to el8 (#6995)
- suse15: remove and symlink to centos8 - Use Boolean dependencies to package for EL8 or SUSE15 https://rpm-software-management.github.io/rpm/manual/boolean_dependencies.html Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 2bb6439 commit 63bc5a8

File tree

8 files changed

+17
-919
lines changed

8 files changed

+17
-919
lines changed

packaging/centos8/cloud.spec

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ Requires: bzip2
6464
Requires: gzip
6565
Requires: unzip
6666
Requires: /sbin/mount.nfs
67-
Requires: openssh-clients
68-
Requires: nfs-utils
67+
Requires: (openssh-clients or openssh)
68+
Requires: (nfs-utils or nfs-client)
6969
Requires: iproute
7070
Requires: wget
7171
Requires: mysql
7272
Requires: sudo
7373
Requires: /sbin/service
7474
Requires: /sbin/chkconfig
7575
Requires: /usr/bin/ssh-keygen
76-
Requires: genisoimage
76+
Requires: (genisoimage or mkisofs)
7777
Requires: ipmitool
7878
Requires: %{name}-common = %{_ver}
79-
Requires: iptables-services
80-
Requires: qemu-img
79+
Requires: (iptables-services or iptables)
80+
Requires: (qemu-img or qemu-tools)
8181
Requires: python3-pip
8282
Requires: python3-setuptools
83-
Requires: libgcrypt > 1.8.3
83+
Requires: (libgcrypt > 1.8.3 or libgcrypt20)
8484
Group: System Environment/Libraries
8585
%description management
8686
The CloudStack management server is the central point of coordination,
@@ -96,21 +96,22 @@ The Apache CloudStack files shared between agent and management server
9696

9797
%package agent
9898
Summary: CloudStack Agent for KVM hypervisors
99-
Requires: openssh-clients
99+
Requires: (openssh-clients or openssh)
100100
Requires: java-11-openjdk
101101
Requires: %{name}-common = %{_ver}
102102
Requires: libvirt
103103
Requires: ebtables
104104
Requires: iptables
105105
Requires: ethtool
106-
Requires: net-tools
106+
Requires: (net-tools or net-tools-deprecated)
107107
Requires: iproute
108108
Requires: ipset
109109
Requires: perl
110-
Requires: python3-libvirt
111-
Requires: qemu-img
110+
Requires: (python3-libvirt or python3-libvirt-python)
111+
Requires: (qemu-img or qemu-tools)
112112
Requires: qemu-kvm
113-
Requires: libgcrypt > 1.8.3
113+
Requires: (libgcrypt > 1.8.3 or libgcrypt20)
114+
Requires: (selinux-tools if qemu-tools)
114115
Provides: cloud-agent
115116
Group: System Environment/Libraries
116117
%description agent
@@ -403,7 +404,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
403404

404405
%pre management
405406
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
406-
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
407+
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud || true
407408

408409
rm -rf %{_localstatedir}/cache/cloudstack
409410

@@ -669,6 +670,9 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
669670
%attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal
670671

671672
%changelog
673+
* Tue Jun 29 2021 David Jumani <dj.davidjumani1994@gmail.com> 4.16.0
674+
- Adding SUSE 15 support
675+
672676
* Thu Apr 30 2015 Rohit Yadav <bhaisaab@apache.org> 4.6.0
673677
- Remove awsapi package
674678

@@ -680,4 +684,3 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
680684

681685
* Fri Oct 5 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
682686
- new style spec file
683-

packaging/suse15

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
centos8

packaging/suse15/cloud-ipallocator.rc

Lines changed: 0 additions & 96 deletions
This file was deleted.

packaging/suse15/cloud.limits

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)