This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 8738ca7 kvm: use libvirtd as service name for all distributions
(#2925)
8738ca7 is described below
commit 8738ca75b1a416103ec39533f035598f9d2098db
Author: Rohit Yadav <[email protected]>
AuthorDate: Mon Oct 29 11:55:28 2018 +0530
kvm: use libvirtd as service name for all distributions (#2925)
Since we support only Ubuntu 16.04+ on master/4.12+, we can now use
the libvirt service name `libvirtd` for all distributions. This also
fixes an optional package name for libvirtd installation on Debian 9+.
Fixes #2909
Signed-off-by: Rohit Yadav <[email protected]>
---
debian/control | 2 +-
debian/rules | 3 ---
.../wrapper/LibvirtPostCertificateRenewalCommandWrapper.java | 6 +-----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/debian/control b/debian/control
index 2fc5af6..7ef3c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: CloudStack server library
Package: cloudstack-agent
Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless |
java8-runtime | openjdk-9-jre-headless, cloudstack-common (=
${source:Version}), lsb-base (>= 9), libcommons-daemon-java, openssh-client,
qemu-kvm (>= 2.5), libvirt-bin (>= 1.3), uuid-runtime, iproute2, ebtables,
vlan, ipset, python-libvirt, ethtool, iptables, lsb-release, aria2
+Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless |
java8-runtime | openjdk-9-jre-headless, cloudstack-common (=
${source:Version}), lsb-base (>= 9), libcommons-daemon-java, openssh-client,
qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0),
uuid-runtime, iproute2, ebtables, vlan, ipset, python-libvirt, ethtool,
iptables, lsb-release, aria2
Recommends: init-system-helpers
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
diff --git a/debian/rules b/debian/rules
index 4ac524b..07f5715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,6 @@ override_dh_auto_install:
install -D plugins/hypervisors/kvm/target/dependencies/*
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -d -m0755 debian/$(PACKAGE)-agent/lib/systemd/system
- # Fix libvirt service name for Debian/Ubuntu
- sed -i 's/Requires=libvirtd.service/Requires=libvirt-bin.service/g'
packaging/systemd/$(PACKAGE)-agent.service
- sed -i 's/After=libvirtd.service/After=libvirt-bin.service/g'
packaging/systemd/$(PACKAGE)-agent.service
install -m0644 packaging/systemd/$(PACKAGE)-agent.service
debian/$(PACKAGE)-agent/lib/systemd/system/$(PACKAGE)-agent.service
install -m0644 packaging/systemd/$(PACKAGE)-agent.default
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-agent
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
index 2802d42..5f8e2ca 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
@@ -38,11 +38,7 @@ public final class
LibvirtPostCertificateRenewalCommandWrapper extends CommandWr
if (command != null) {
final int timeout = 30000;
Script script = new Script(true, "service", timeout, s_logger);
- if ("Ubuntu".equals(serverResource.getHostDistro())) {
- script.add("libvirt-bin");
- } else {
- script.add("libvirtd");
- }
+ script.add("libvirtd");
script.add("restart");
script.execute();
return new SetupCertificateAnswer(true);
