etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,752 Commits 327 Branches 325 Tags 885 MiB
Commit Graph

8329 Commits

Author SHA1 Message Date
Rohit Yadav 2803cac06b CLOUDSTACK-6075: Increase the ram size for router service offering 
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-02 20:16:45 +05:30
Koushik Das 291a34aac1 CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules

(cherry picked from commit 513adab51b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-02 15:48:44 +05:30
Koushik Das c44262bfc2 CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-01 17:50:32 +05:30
Rohit Yadav d1f008e2f2 CLOUDSTACK-7903: Fix build regression from previous fix 
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 16:46:56 +05:30
Ilia Shakitko 342b73d37a CLOUDSTACK-7903: Decreased minimal usage aggregation range value 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 15:56:46 +05:30
Daan Hoogland 7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-11-25 15:36:02 +01:00
Daan Hoogland e0420a6fec Updating pom.xml version numbers for release 4.4.2 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-11-21 03:41:26 +01:00
Syed 9f83a4d43b CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-20 09:46:55 -05:00
Anshul Gangwar 5b620951a3 CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop. 
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)

Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-11-19 12:03:30 +01:00
Will Stevens 9c0c4f713f CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 
(cherry picked from commit 92d4a41a69)

Conflicts:
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/root_chain.crt
	server/test/resources/certs/root_chain.key
	server/test/resources/certs/rsa_ca_signed2.crt
 2014-11-13 16:50:51 +01:00
Daan Hoogland 8de7f84ad5 reenable tests for certs as far as working 2014-11-11 15:47:35 +01:00
Rohit Yadav 5e57eeefd9 CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 97fa4a023e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2014-11-10 17:59:54 +05:30
Frank Zhang 1d92eebbe5 fix expried certificate in unit test 
(cherry picked from commit 88561e154f)
 2014-11-10 10:21:15 +01:00
Daan Hoogland b9620c2cbe Updating pom.xml version numbers for release 4.4.2-SNAPSHOT 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-10-19 20:46:15 +02:00
Daan Hoogland d8359211f1 CLOUDSTACK-7702 added keytool to sudoers modification specs 2014-10-14 10:05:43 +02:00
Daan Hoogland 63fbd16dd1 CLOUDSTACK-7219 log warning when config item is missing from scope 2014-10-02 11:58:20 +02:00
Daan Hoogland 08b9a96b7c CLOUDSTACK-7219 added nullcheck to config retrieval 2014-10-02 11:12:55 +02:00
Daan Hoogland 4d065b9a3a CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval 2014-09-16 12:25:07 +02:00
Upendra Moturi 213bdbde35 CLOUDSTACK-6223. removeNicFromVirtualMachine fails if another instance in another domain has a nic with the same ip and a forwarding rule configured on it 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit e9af5f44ae)
 2014-09-12 12:07:04 +02:00
Rohit Yadav f4f5ea3cc0 CLOUDSTACK-7528: More verbose logging when sending alert fails 
When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

(cherry picked from commit 91fd8d7cd5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java
 2014-09-10 11:45:02 +02:00
Daan Hoogland 61892bb28a CID 1237195: null deref when no project found 2014-09-05 14:37:37 +02:00
Will Stevens 6c501dba45 CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is associated 2014-09-04 12:49:23 -04:00
Daan Hoogland eaf3ad1db4 Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4 2014-09-04 11:05:58 +02:00
Fred Clift 54e9a92d24 make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 04:24:16 -04:00
Will Stevens 92339bca0b CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects 2014-09-02 15:25:41 -04:00
Saksham Srivastava 6e20058fb7 CLOUDSTACK-6508: impossible to list projects from API with domainid set 
(cherry picked from commit 19b72d6cf5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-21 03:17:32 +02:00
Daan Hoogland ca6d0a3cef Merge remote-tracking branch 'origin/hotfix/4.4-6905' into 4.4 2014-08-18 20:23:00 +02:00
Wei Zhou 838a1a8476 CLOUDSTACK-7362: fix wrong uuid issue for resource tags 2014-08-18 16:00:22 +02:00
Wei Zhou ae1b87ca23 CLOUDSTACK-7308: add tags to all security group rules 2014-08-18 14:41:53 +02:00
Wei Zhou b55c114932 CLOUDSTACK-7308: tags for security group rules (additional commit for 4.4) 2014-08-15 09:51:39 +02:00
Stephen Hoogendijk f41019d5b2 CLOUDSTACK-7308 - Adds tagging support for security group rules 
(cherry picked from commit 6978c18c3a)
 2014-08-15 09:41:15 +02:00
Luis Henrique Okama 260e694e89 bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 00:06:17 +02:00
amoghvk 9800b9f07a CLOUDSTACK-7295: VMs is Stopped state have no host ID, resulting in NPE 2014-08-11 14:56:07 -07:00
Murali Reddy de85c4d555 CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared 
networks

fix ensures only admin users can delete shared network

(cherry picked from commit 2f293f42d5)
 2014-08-08 12:15:40 +02:00
Rohit Yadav d79251853b CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 89fabe82b9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 19:04:22 +02:00
Kishan Kavala ccee282a74 CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm. 
(cherry picked from commit 89854de18d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 18:50:43 +02:00
Jayapal 865cdc08e5 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 
(cherry picked from commit 252e58381a)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:36:22 +02:00
Nitin Mehta 6d0e43d36b CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command 
(cherry picked from commit 63c4f02897)
 2014-07-30 13:33:22 +02:00
Nitin Mehta 6f709f59cc CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:31:14 +02:00
Nitin Mehta 1fbee507ea CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag 
(cherry picked from commit 5cf8edd7ec)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:24:31 +02:00
Nitin Mehta adfb44ec33 CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name 
(cherry picked from commit 18c6ae0796)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 12:52:15 +02:00
Nitin Mehta fec9ccf446 CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume 
(cherry picked from commit 1e78354882)
 2014-07-28 16:02:49 +02:00
Prachi Damle 20a457dd6e CLOUDSTACK-6941: Can't choose storage for the volume, when attaching uploaded data volume to VM 
Changes:
- Only way to choose a certain storage pool is by using disk_offering_tags
- Added a parameter to take in a disk offering Id.
- Admin will have to create a custom sized disk offering and tag it as necessary for the user
- This custom offering Id should be passed during uploadVolume to associate the volume with this disk offering

(cherry picked from commit 13bd8beb91)
 2014-07-28 16:02:41 +02:00
Min Chen 30b22ae275 CLOUDSTACK-6940:Templates cannot be downloaded from URLs without 
matching file extensions.

(cherry picked from commit 008162a757)
 2014-07-28 16:02:41 +02:00
Alena Prokharchyk 388af6c349 CLOUDSTACK-6919: don't attempt to restart user vms having no Root volume attached 
(cherry picked from commit 146867eb07)
 2014-07-28 16:02:36 +02:00
Alena Prokharchyk 31ed30af56 CLOUDSTACK-6907: lisVolumes - make a decision whether to set service or disk offering in the response, based on the DiskOfferingVO type entry, not the volume Type 
(cherry picked from commit 43e479d238)
 2014-07-28 16:02:33 +02:00
Rajani Karuturi 713572887c Fixed few coverity issues unused assignments, boxing and unboxing of values etc. 
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 32a7d5d387)
 2014-07-28 16:02:33 +02:00
Anthony Xu 9fbb35d13d fixed a typo 
(cherry picked from commit 40207929f7)
 2014-07-28 16:02:17 +02:00
Anthony Xu 742e1b1954 if networkID is not specified, get one network with free ips. 
(cherry picked from commit 8c5a9ec4de)
 2014-07-28 16:02:16 +02:00
Nitin Mehta 5c9ca6c22d CLOUDSTACK-6699: listResouceDetails - enhance it to list by (key,value) pair - allowed to Admin only. 
(cherry picked from commit d5425e1a4a)
 2014-07-28 16:02:13 +02:00