From 7c3ab31fbb866f04d63b2436f0a0709da4d2cc35 Mon Sep 17 00:00:00 2001 From: tuna Date: Thu, 3 Apr 2014 01:49:31 +0700 Subject: [PATCH] deploy docker vm without starting it --- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 6d18f864258..6e9e78c50a9 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); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 052c6781937..7c2fd4f5982 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) {