mirror of https://github.com/apache/cloudstack.git
fixups
This commit is contained in:
parent
31a4a014db
commit
0dfde45184
|
|
@ -323,7 +323,9 @@ public class CAManagerImpl extends ManagerBase implements CAManager {
|
|||
|
||||
provisionCertificateViaSsh(sshConnection, hostIp, host.getName(), caProvider);
|
||||
|
||||
SSHCmdHelper.sshExecuteCmd(sshConnection, "sudo service libvirtd restart");
|
||||
SSHCmdHelper.sshExecuteCmd(sshConnection, "sudo service cloudstack-agent restart");
|
||||
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
logger.error("Error during forced SSH provisioning for KVM host " + host.getUuid(), e);
|
||||
|
|
|
|||
|
|
@ -290,6 +290,7 @@ public class CAManagerImplTest {
|
|||
|
||||
Assert.assertTrue(result);
|
||||
Mockito.verify(caManager, Mockito.times(1)).provisionCertificateViaSsh(Mockito.any(Connection.class), Mockito.eq("192.168.1.1"), Mockito.eq("host1"), Mockito.eq("root"));
|
||||
sshCmdHelperMock.verify(() -> SSHCmdHelper.sshExecuteCmd(Mockito.any(Connection.class), Mockito.eq("sudo service libvirtd restart")), Mockito.times(1));
|
||||
sshCmdHelperMock.verify(() -> SSHCmdHelper.sshExecuteCmd(Mockito.any(Connection.class), Mockito.eq("sudo service cloudstack-agent restart")), Mockito.times(1));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ export default {
|
|||
show: (record) => {
|
||||
return record.hypervisor === 'KVM' || record.hypervisor === store.getters.customHypervisorName
|
||||
},
|
||||
args: ['hostid'],
|
||||
args: ['hostid', 'forced'],
|
||||
mapping: {
|
||||
hostid: {
|
||||
value: (record) => { return record.id }
|
||||
|
|
|
|||
Loading…
Reference in New Issue