Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Prachi Damle
022b9b8f80
Add access for domain wide createAffinityGroup
2014-02-03 18:14:56 -08:00
Prachi Damle
a6d07c873c
Changes to QuerySelector to list the parent group resources with recursive = true access
2014-02-03 17:49:33 -08:00
Prachi Damle
939b15169c
changes to support the domain wide resources for Network
2014-02-03 17:34:03 -08:00
Hugo Trippaers
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01:00
Koushik Das
580ebb0010
CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency
...
The fix is to fail the start operation if a vm snapshot is in progress
2014-01-31 10:39:43 +05:30
Nitin Mehta
0e2e6995b7
CLOUDSTACK-5997:
...
Template state changes side affects
2014-01-30 17:59:55 -08:00
Alena Prokharchyk
02bdb28d76
Resource metadata support for autoscale vm group object
2014-01-30 13:04:56 -08:00
Prachi Damle
d12422bf68
Add policies to domain group for CreateNetwork usecase for a domain wide shared network
2014-01-29 23:56:25 -08:00
Alena Prokharchyk
fdb25d6f5b
Resource metadata support for autoscaleVmProfile CS object
2014-01-29 14:57:00 -08:00
Min Chen
72812cdf22
Grant public template permission to domain admin and normal user policy.
2014-01-28 17:41:27 -08:00
Min Chen
16a9171f55
Fix trailing whitespace.
2014-01-28 14:53:18 -08:00
Min Chen
a26c81178b
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.
2014-01-28 14:49:58 -08:00
Laszlo Hornyak
ebf57654e7
replaced Long instantiations with Autoboxing
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 15:01:03 +01:00
Jayapal
c53778c333
CLOUDSTACK-5810 updated null checks and preparestmt and resultset close
...
Closing the prepare statement and result set and assigning null to the object after close.
2014-01-23 18:27:03 +05:30
Damodar Reddy
4925b9f6a1
CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic
2014-01-23 18:14:12 +05:30
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Mike Tutkowski
b5b4607f79
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-22 11:17:39 -07:00
Min Chen
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
Mike Tutkowski
90e945fd74
Fixing an issue with expunge logic
2014-01-20 16:25:39 -07:00
Jayapal
569b558b92
CLOUDSTACK-5810 Added upgrade changes for updating accountid and domainid of nic secondary ip
2014-01-20 16:05:03 +05:30
Mike Tutkowski
37332ad9d4
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-18 18:07:10 -07:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Kelven Yang
a9733b5df2
CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations
2014-01-17 11:55:14 -08:00
Anthony Xu
58a9a9b0cd
only send stop command when agent reports VM running and CS thinks it is stopped.
2014-01-17 11:50:13 -08:00
Prachi Damle
8a20d89d14
CLOUDSTACK-5895: CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged storagepool
...
Changes:
- After finding the storagepool suitable to create the volume, we should not look for more pods
2014-01-17 11:22:20 -08:00
Kishan Kavala
c8f6ec043d
CLOUDSTACK-5892: Disabled removal of old system Vm templates during upgrades. Updated hyperV template URL and checksum
2014-01-17 17:13:40 +05:30
Kishan Kavala
c0f60651b9
CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3
2014-01-17 12:51:16 +05:30
Mike Tutkowski
e9c9887ee0
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:20:54 -07:00
Mike Tutkowski
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
Kelven Yang
7164fc6e73
CLOUDSTACK-5696: Fix sync issue with out-of-band changes
2014-01-15 13:11:02 -08:00
Hugo Trippaers
9aaea28d0d
Fix typo
2014-01-15 15:20:48 +01:00
Sateesh Chodapuneedi
ba96c8cadf
CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"
...
Bump up RAM size of system offering for SSVM to 512MB
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-01-15 01:45:12 +05:30
Alex Huang
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
Prachi Damle
fac9f2da0f
Adding messageBus events for adding and removal of an account.
2014-01-13 22:12:39 -08:00
Murali Reddy
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Min Chen
43f0f901dd
Remove VO and DAO from cloud-engine-schema.
2014-01-10 15:57:39 -08:00
Mike Tutkowski
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
Marcus Sorensen
fc082832d3
CLOUDSTACK-5853
...
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07:00
Kishan Kavala
9486a9652e
CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
Mike Tutkowski
7ef78aac40
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:37:39 -07:00
Mike Tutkowski
6944bf9bba
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:02:43 -07:00
Mike Tutkowski
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
Alex Huang
bc1eec9f70
Fixed a missing package name
2014-01-09 16:48:19 -08:00
Alex Huang
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
Kelven Yang
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
Kelven Yang
0965adb003
CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic
2014-01-09 14:29:12 -08:00
Kelven Yang
87381d4236
CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging
2014-01-09 14:29:12 -08:00
Kelven Yang
ad6454d2bf
CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.
2014-01-09 14:29:12 -08:00
Kelven Yang
737a382c38
Fix a typo caused problem in attach-volume process
2014-01-09 14:29:12 -08:00