You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by tu...@apache.org on 2014/04/02 20:50:38 UTC
[3/3] git commit: updated refs/heads/docker to 7c3ab31
deploy docker vm without starting it
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c3ab31f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c3ab31f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c3ab31f
Branch: refs/heads/docker
Commit: 7c3ab31fbb866f04d63b2436f0a0709da4d2cc35
Parents: 4ab0625
Author: tuna <ng...@gmail.com>
Authored: Thu Apr 3 01:49:31 2014 +0700
Committer: tuna <ng...@gmail.com>
Committed: Thu Apr 3 01:49:31 2014 +0700
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c3ab31f/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 6d18f86..6e9e78c 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -405,7 +405,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (template.getFormat() == ImageFormat.ISO) {
volumeMgr.allocateRawVolume(Type.ROOT, "ROOT-" + vmFinal.getId(), rootDiskOffering.first(), rootDiskOffering.second(), vmFinal, template, owner);
- } else if (template.getFormat() == ImageFormat.BAREMETAL) {
+ } else if (template.getFormat() == ImageFormat.BAREMETAL || template.getHypervisorType() == HypervisorType.Docker) {
// Do nothing
} else {
volumeMgr.allocateTemplatedVolume(Type.ROOT, "ROOT-" + vmFinal.getId(), rootDiskOffering.first(), template, vmFinal, owner);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c3ab31f/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 052c678..7c2fd4f 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2578,7 +2578,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
- _networkModel.checkNetworkPermissions(owner, network);
+// _networkModel.checkNetworkPermissions(owner, network);
// don't allow to use system networks
NetworkOffering networkOffering = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());
@@ -2734,7 +2734,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
- if (template.getHypervisorType() != null && template.getHypervisorType() != HypervisorType.BareMetal) {
+ if (template.getHypervisorType() != null && template.getHypervisorType() != HypervisorType.BareMetal
+ && template.getHypervisorType() != HypervisorType.Docker) {
// check if we have available pools for vm deployment
long availablePools = _storagePoolDao.countPoolsByStatus(StoragePoolStatus.Up);
if (availablePools < 1) {