mlsorensen commented on code in PR #6710:
URL: https://github.com/apache/cloudstack/pull/6710#discussion_r968643491
##########
server/src/main/java/com/cloud/network/router/CommandSetupHelper.java:
##########
@@ -210,11 +214,18 @@ public void createVmDataCommand(final VirtualRouter
router, final UserVm vm, fin
Host host = _hostDao.findById(vm.getHostId());
String destHostname =
VirtualMachineManager.getHypervisorHostname(host != null ? host.getName() : "");
- cmds.addCommand(
- "vmdata",
- generateVmDataCommand(router, nic.getIPv4Address(),
vm.getUserData(), serviceOffering, zoneName,
- staticNatIp == null || staticNatIp.getState() !=
IpAddress.State.Allocated ? null : staticNatIp.getAddress().addr(),
vm.getHostName(), vm.getInstanceName(),
- vm.getId(), vm.getUuid(), publicKey,
nic.getNetworkId(), destHostname));
+ VmDataCommand vmDataCommand = generateVmDataCommand(router,
nic.getIPv4Address(), vm.getUserData(), serviceOffering, zoneName,
+ staticNatIp == null || staticNatIp.getState() !=
IpAddress.State.Allocated ? null : staticNatIp.getAddress().addr(),
vm.getHostName(), vm.getInstanceName(),
+ vm.getId(), vm.getUuid(), publicKey, nic.getNetworkId(),
destHostname);
+
+ Domain domain = domainDao.findById(vm.getDomainId());
+ if (domain != null &&
VirtualMachineManager.AllowExposeDomainInMetadata.valueIn(domain.getId())) {
+ s_logger.debug("Adding domain info to cloud metadata");
Review Comment:
I think in context of the individual job log this info would be apparent,
someone troubleshooting (e.g. searching logs by job or logid) would know what
VM was being acted upon.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
