2231 Commits

Author SHA1 Message Date
Mike Tutkowski
455ffc3342 Create a template from a SAN snapshot 2014-11-06 10:33:23 -07:00
Rajani Karuturi
6766b6c6e4 Merge branch '4.5' 2014-11-06 09:46:30 +05:30
Rajani Karuturi
d969364daf Fixed coverity issue
CID 11461 (#1 of 1): DLS: Dead local store (FB.DLS_DEAD_LOCAL_STORE)
2014-11-06 09:38:22 +05:30
Sanjay Tripathi
5a67fe7369 CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:44:54 +05:30
Sanjay Tripathi
b844155240 CLOUDSTACK-7842: Wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:42:28 +05:30
Frank Zhang
28d5b9827a remove duplicate import 2014-11-03 17:04:30 -08:00
Frank Zhang
c8f72780ea CLOUDSTACK-7834
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
2014-11-03 16:44:53 -08:00
Frank Zhang
62c5cefb82 CLOUDSTACK-7834
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone
2014-11-03 16:43:09 -08:00
Anthony Xu
aa84770347 if attach volume fails, destroy the VBD device 2014-11-03 11:20:37 -08:00
Santhosh Edukulla
1aef5cba66 Fixed Coverity Issues 2014-11-03 16:45:30 +05:30
amoghvk
efc9632c1b CLOUDSTACK:6915 search including removed 2014-10-31 15:47:18 -07:00
amoghvk
0c153966e6 CLOUDSTACK:6915 search including removed 2014-10-31 15:29:07 -07:00
Logan Barfield
3a52a83fae Fixed root disk resize on deploy for RBD.
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2014-10-31 22:17:27 +01:00
punith-cloudbyte
09a62b8389 new managed nfs storage adapter
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2014-10-30 16:07:59 -06:00
Rohit Yadav
f543d86eff saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:39 +05:30
Rohit Yadav
cd52bed477 saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
Anthony Xu
b8d6396409 don't need to check if pv driver is updated, old pv driver should work 2014-10-30 10:27:34 -07:00
Hugo Trippaers
4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Hugo Trippaers
0080905ad4 CID-1249803 Remove dead code 2014-10-29 11:10:41 +01:00
Hugo Trippaers
f5353d30f5 Merge branch 'bugfix/CID-1249800' 2014-10-29 09:42:05 +01:00
Hugo Trippaers
320544fa51 CID-1249800 Fix a coverity bug, but disable the code its used in as it
needs rethinking
2014-10-29 09:38:40 +01:00
Hugo Trippaers
ab980cd3b7 CID-1249801 This should be a string comparison, not an object comparison 2014-10-29 09:24:19 +01:00
Frank Zhang
1b535e20e6 fixing build because missig ListBaremetalRctCmd 2014-10-27 16:52:05 -07:00
Frank Zhang
1b0a0d68f1 CLOUDSTACK-7795
Fix multiple baremetal rct configuraitons

Conflicts:
	api/src/com/cloud/event/EventTypes.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
2014-10-27 16:11:26 -07:00
Frank Zhang
2ae40237a4 CLOUDSTACK-7795
Fix multiple baremetal rct configuraitons
2014-10-27 15:14:08 -07:00
Anthony Xu
95b9be0cb6 allow reentrance of disassociate ip , if vif is gone, return success 2014-10-27 11:07:51 -07:00
Mike Tutkowski
2d7187e002 Update to SolidFire driver regarding snapshots 2014-10-22 15:55:35 -06:00
Mike Tutkowski
b1ffd88a42 Save off the UUID of the VDI before detaching its SR 2014-10-21 16:01:15 -06:00
Mike Tutkowski
1b5bb7d8c6 Invoke grantAccess and revokeAccess one time each using a SnapshotInfo (where previously a VolumeInfo was being passed in)
Handle the case where a SnapshotInfo is passed into the grantAccess and revokeAccess methods
2014-10-21 16:01:14 -06:00
Mike Tutkowski
57dacf99a2 Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
2014-10-21 16:01:14 -06:00
Mike Tutkowski
b29265f159 Logic around granting and revoking access to the volume that backs the snapshot 2014-10-21 16:01:14 -06:00
Mike Tutkowski
0cea0346ae Support for back-end snapshots on primary storage 2014-10-21 16:01:14 -06:00
Mike Tutkowski
6beeeff7d4 Logic on SolidFire side for CloudStack snapshots 2014-10-21 16:01:13 -06:00
Mike Tutkowski
06f6b00cd1 Snapshot support 2014-10-21 16:01:13 -06:00
Anthony Xu
45611a0f83 don't need to check if pv driver is updated, old pv driver should work 2014-10-21 11:14:15 -07:00
Edison Su
1a98992c5a fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment featre enabled 2014-10-21 10:32:29 -07:00
Edison Su
6d22ff1d94 Revert "fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment featre enabled"
This reverts commit c9dcae548056aa477e4156a1ec2efc9a83813aed.
2014-10-21 10:16:59 -07:00
Daan Hoogland
1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Edison Su
c9dcae5480 fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment featre enabled 2014-10-16 12:51:23 -07:00
Daan Hoogland
148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
Sanjay Tripathi
80e0c99189 Removed duplicate code and unused imports which was causing build failure. 2014-10-16 13:53:32 +05:30
Mike Tutkowski
e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06:00
Mike Tutkowski
35a8b70799 Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage) 2014-10-14 12:26:40 -06:00
Daan Hoogland
771d052381 Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack 2014-10-14 20:14:50 +02:00
Wilder Rodrigues
b97f2b05c7 apply network acls; acls items to pvt gw; vpc ip association
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:01:14 +02:00
Sanjay Tripathi
176e0d47bb CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
2014-10-14 17:55:37 +05:30
Sanjay Tripathi
e4a8bbcdf4 CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
2014-10-14 17:53:50 +05:30
Santhosh Edukulla
0a9742f914 Fixed few coverity issues
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-14 17:16:50 +05:30
Frank Zhang
49c01e2ae4 Don't do chmod -R when mounting secondary storage for vmware
It causes extreme long vm start time when managment server has slow connection to secondary storage
2014-10-13 12:06:37 -07:00
Anthony Xu
95c7ffbd46 fixed NPE on calculating vm snasphot volume size 2014-10-13 10:49:45 -07:00