Skip to content

Commit 6adca9a

Browse files
committed
fixups
1 parent a77ed3e commit 6adca9a

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,9 @@ private boolean provisionKvmHostViaSsh(Host host, String caProvider) {
323323

324324
provisionCertificateViaSsh(sshConnection, hostIp, host.getName(), caProvider);
325325

326+
SSHCmdHelper.sshExecuteCmd(sshConnection, "sudo service libvirtd restart");
326327
SSHCmdHelper.sshExecuteCmd(sshConnection, "sudo service cloudstack-agent restart");
328+
327329
return true;
328330
} catch (Exception e) {
329331
logger.error("Error during forced SSH provisioning for KVM host " + host.getUuid(), e);

server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ public void testProvisionKvmHostViaSsh() throws Exception {
290290

291291
Assert.assertTrue(result);
292292
Mockito.verify(caManager, Mockito.times(1)).provisionCertificateViaSsh(Mockito.any(Connection.class), Mockito.eq("192.168.1.1"), Mockito.eq("host1"), Mockito.eq("root"));
293+
sshCmdHelperMock.verify(() -> SSHCmdHelper.sshExecuteCmd(Mockito.any(Connection.class), Mockito.eq("sudo service libvirtd restart")), Mockito.times(1));
293294
sshCmdHelperMock.verify(() -> SSHCmdHelper.sshExecuteCmd(Mockito.any(Connection.class), Mockito.eq("sudo service cloudstack-agent restart")), Mockito.times(1));
294295
}
295296
}

ui/src/config/section/infra/hosts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default {
103103
show: (record) => {
104104
return record.hypervisor === 'KVM' || record.hypervisor === store.getters.customHypervisorName
105105
},
106-
args: ['hostid'],
106+
args: ['hostid', 'forced'],
107107
mapping: {
108108
hostid: {
109109
value: (record) => { return record.id }

0 commit comments

Comments
 (0)