cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/6] git commit: updated refs/heads/master to d8c038e
Date Fri, 25 Nov 2016 07:41:20 GMT
CLOUDSTACK-9566 instance-id metadata for baremetal VM returns ID


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/759a92d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/759a92d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/759a92d2

Branch: refs/heads/master
Commit: 759a92d2516a99b90b59dc096f23e2e903d0673b
Parents: 5a2a2f4
Author: Sudharma Jain <sudharma.jain@accelerite.com>
Authored: Thu Oct 27 13:50:39 2016 +0530
Committer: Sudharma Jain <sudharma.jain@accelerite.com>
Committed: Thu Oct 27 13:50:39 2016 +0530

----------------------------------------------------------------------
 .../cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759a92d2/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
index ea3245c..22f9395 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
@@ -200,7 +200,7 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe
         cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vm.getInstanceName()));
         cmd.addVmData("metadata", "public-ipv4", nic.getIPv4Address());
         cmd.addVmData("metadata", "public-hostname", StringUtils.unicodeEscape(vm.getInstanceName()));
-        cmd.addVmData("metadata", "instance-id", String.valueOf(vm.getId()));
+        cmd.addVmData("metadata", "instance-id", String.valueOf(vm.getUuid()));
         cmd.addVmData("metadata", "vm-id", String.valueOf(vm.getInstanceName()));
         cmd.addVmData("metadata", "public-keys", null);
         String cloudIdentifier = _configDao.getValue("cloud.identifier");


Mime
View raw message