Skip to content

Commit 289a43f

Browse files
mlsorensenyadvr
andauthored
packaging: Uses rng-tools for entropy, not haveged for cloudstack-management (#6775)
* EL8 uses rng-tools, not haveged, to gather entropy * packaging: use rng-tools/rngd consistently across all distros Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Co-authored-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent a7ba6a1 commit 289a43f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
1515

1616
Package: cloudstack-management
1717
Architecture: all
18-
Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, haveged, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools
18+
Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, rng-tools, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools
1919
Conflicts: cloud-server, cloud-client, cloud-client-ui
2020
Description: CloudStack server library
2121
The CloudStack management server

packaging/centos7/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Requires: ipmitool
8585
Requires: %{name}-common = %{_ver}
8686
Requires: iptables-services
8787
Requires: qemu-img
88-
Requires: haveged
88+
Requires: rng-tools
8989
Requires: python3-pip
9090
Requires: python3-setuptools
9191
Group: System Environment/Libraries
@@ -444,7 +444,7 @@ pip3 install %{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-
444444
pip3 install urllib3
445445

446446
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
447-
/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
447+
/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
448448

449449
grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
450450
grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"

packaging/centos8/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Requires: ipmitool
8080
Requires: %{name}-common = %{_ver}
8181
Requires: iptables-services
8282
Requires: qemu-img
83-
Requires: haveged
83+
Requires: rng-tools
8484
Requires: python3-pip
8585
Requires: python3-setuptools
8686
Requires: libgcrypt > 1.8.3
@@ -435,7 +435,7 @@ fi
435435
pip3 install %{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
436436

437437
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
438-
/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
438+
/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
439439

440440
grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
441441
grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"

packaging/suse15/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Requires: mkisofs
8080
Requires: ipmitool
8181
Requires: %{name}-common = %{_ver}
8282
Requires: qemu-tools
83-
Requires: haveged
83+
Requires: rng-tools
8484
Requires: python3-pip
8585
Requires: python3-setuptools
8686
Requires: libgcrypt20
@@ -437,7 +437,7 @@ fi
437437
pip3 install %{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
438438

439439
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
440-
/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
440+
/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
441441

442442
grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
443443
grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"

0 commit comments

Comments
 (0)