Repository: cloudstack Updated Branches: refs/heads/master cb5597167 -> 6155d3eca
CLOUDSTACK-6278 Baremetal Advanced Networking support Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6155d3ec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6155d3ec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6155d3ec Branch: refs/heads/master Commit: 6155d3ecaa1134d349e2a290dd3d2f664a23732e Parents: cb55971 Author: Frank Zhang <frank.zh...@citrix.com> Authored: Mon Sep 22 13:57:32 2014 -0700 Committer: Frank Zhang <frank.zh...@citrix.com> Committed: Mon Sep 22 13:57:32 2014 -0700 ---------------------------------------------------------------------- .../com/cloud/baremetal/manager/BaremetalManagerImpl.java | 1 + .../baremetal/networkservice/BareMetalResourceBase.java | 10 ++++++---- systemvm/patches/debian/config/etc/rc.local | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6155d3ec/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java index d4a75dc..92163ea 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java @@ -147,6 +147,7 @@ public class BaremetalManagerImpl extends ManagerBase implements BaremetalManage } vm.setState(State.Running); + vm.setLastHostId(vm.getHostId()); vmDao.update(vm.getId(), vm); s_logger.debug(String.format("received baremetal provision done notification for vm[id:%s name:%s] running on host[mac:%s, ip:%s]", vm.getId(), vm.getInstanceName(), host.getPrivateMacAddress(), host.getPrivateIpAddress())); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6155d3ec/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 26f42be..ab863dc 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -36,7 +36,6 @@ import com.cloud.agent.api.MigrateAnswer; import com.cloud.agent.api.MigrateCommand; import com.cloud.agent.api.PingCommand; import com.cloud.agent.api.PingRoutingCommand; -import com.cloud.agent.api.PingRoutingWithNwGroupsCommand; import com.cloud.agent.api.PrepareForMigrationAnswer; import com.cloud.agent.api.PrepareForMigrationCommand; import com.cloud.agent.api.ReadyAnswer; @@ -59,7 +58,6 @@ import com.cloud.configuration.Config; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ServerResource; -import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria; @@ -395,10 +393,13 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource return null; } + return new PingRoutingCommand(getType(), id, null); + + /* if (hostId != null) { final List<? extends VMInstanceVO> vms = vmDao.listByHostId(hostId); if (vms.isEmpty()) { - return new PingRoutingCommand(getType(), id, getHostVmStateReport()); + return new PingRoutingCommand(getType(), id, null); } else { VMInstanceVO vm = vms.get(0); SecurityGroupHttpClient client = new SecurityGroupHttpClient(); @@ -406,8 +407,9 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource return new PingRoutingWithNwGroupsCommand(getType(), id, null, nwGrpStates); } } else { - return new PingRoutingCommand(getType(), id, getHostVmStateReport()); + return new PingRoutingCommand(getType(), id, null); } + */ } protected Answer execute(IpmISetBootDevCommand cmd) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6155d3ec/systemvm/patches/debian/config/etc/rc.local ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/rc.local b/systemvm/patches/debian/config/etc/rc.local index fd3488e..ecdbf21 100755 --- a/systemvm/patches/debian/config/etc/rc.local +++ b/systemvm/patches/debian/config/etc/rc.local @@ -25,5 +25,7 @@ then echo 1000000 > /proc/sys/net/nf_conntrack_max fi +python /usr/bin/baremetal-vr.py & + date > /var/cache/cloud/boot_up_done logger -t cloud "Boot up process done"
