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

23671 Commits

Author SHA1 Message Date
Bharat Kumar 56c7fc800a CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-10 13:27:21 +02:00
Gaurav Aradhye bd8eaf86fe CLOUDSTACK-7393: Expunging VM immediately and removing unncessary wait in test_vpc_vm_life_cycle.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 402fc914cf)

Conflicts:
	test/integration/component/test_vpc_vm_life_cycle.py
 2014-09-09 09:14:10 +02:00
Rohit Yadav b7b9cd0d2d CLOUDSTACK-6624: set specifyIpRanges to true if specifyVlan is set to true 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-08 10:54:02 +02:00
Rajani Karuturi ecfe5b5417 CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname 
(cherry picked from commit c468228fe8)

Conflicts:
	packaging/debian/init/cloud-usage
 2014-09-08 10:43:59 +02:00
Daan Hoogland ad601425d1 Merge branch 'hotfix/4.4-7476' of https://github.com/schubergphilis/cloudstack into 4.4 2014-09-06 11:16:47 +02:00
Leo Simons c6136255b9 bugfix/CLOUDSTACK-7476 for 4.4 branch. 
See https://github.com/apache/cloudstack/pull/15 for the pull request
that was merged to master & associated discussion.
 2014-09-05 19:54:36 +02:00
Loic Lambiel 6c39c57342 CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit c1bf7eeeee)
 2014-09-05 17:49:36 +02:00
Daan Hoogland 61892bb28a CID 1237195: null deref when no project found 2014-09-05 14:37:37 +02:00
Rohit Yadav 69575877cf DatabaseUpgradeChecker: add upgrade path for ACS 4.3.1 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-04 23:11:53 +02:00
Rohit Yadav 208399354f schema: add Upgrade431to440 that extends 430to440 
This adds an upgrade path from 4.3.1 to 4.4.0, the implementation of which
simply extends the Upgrade430to440 as there was no schema change between 4.3.0
and 4.3.1

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-04 22:45:10 +02:00
Rohit Yadav 0f84c9b43c schema: Add upgrade path 4.3.0 to 4.3.1 picked from 51f145b 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-04 22:45:10 +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 c900aac682 tag to exclude test in travis 2014-09-04 16:15:49 +02:00
Daan Hoogland eaf3ad1db4 Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4 2014-09-04 11:05:58 +02:00
Ian Duffy 7a57d780bc [CLOUDSTACK-6115] Investigate the use of TravisCI for CloudStack integration testing 
(cherry picked from commit 26069aa377)
 2014-09-04 11:03:56 +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
Min Chen e454acc2c0 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in 
VolumeDataStoreVO.
 2014-09-03 21:36:48 -07:00
Will Stevens 92339bca0b CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects 2014-09-02 15:25:41 -04:00
Daan Hoogland 83d2fd45c5 Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4 2014-08-31 22:21:09 +02:00
Harikrishna Patnala 781a8f5c3c CLOUDSTACK-7087: Latest OS X VPN client not working Downgrading openswan version to 1:2.6.37-3 
Reviewed-by: Abhinandan

Signed-off-by: Sheng Yang
(cherry picked from commit 2dfd278625)
 2014-08-31 19:58:37 +02:00
Daan Hoogland cefaa84407 Merge remote-tracking branch 'origin/hotfix/4.4-7343' into 4.4 2014-08-31 12:01:12 +02:00
Sheng Yang 018bcd26f8 CLOUDSTACK-7124: Fix semicolon caused VPN programming issue on Xen 
(cherry picked from commit abc0b40acb)
 2014-08-30 21:57:24 +02:00
Wido den Hollander 4f494f708b CLOUDSTACK-7405: Make the trailing slash conditional for meta-data requests 
This should fix the cloud-init issues described in this issue.
 2014-08-25 14:31:58 +02:00
Ilia Shakitko 8138984dc9 CLOUDSTACK-7398 SecurityGroup Rule related tags cleanup on rule deletion 
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
(cherry picked from commit 09b09c18cf)
 2014-08-22 12:37:12 +02:00
Daan Hoogland 22f3834734 Merge remote-tracking branch 'origin/hotfix/4.4/6508' into 4.4 2014-08-21 15:58:31 +02: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
Hugo Trippaers b4601be4bf CLOUDSTACK-6892 Create separate package for the mysql HA component 
(cherry picked from commit 539db08956)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
 2014-08-20 12:11:37 +02:00
Rohit Yadav 6a26e77514 CLOUDSTACK-7038: Add mysql client dependency for mgmt server, rpms and debs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-20 12:07:24 +02:00
Wido den Hollander 4f0fc5cb20 kvm: Return capitalized NONE when no disk cache mode is set 
This caused Instances not to start under rare circumstances
 2014-08-19 00:08:00 +02:00
Daan Hoogland 109b1c137a Merge remote-tracking branch 'origin/hotfix/4.4-7193' into 4.4 2014-08-18 20:24:33 +02:00
Daan Hoogland 13bde03adf Merge remote-tracking branch 'origin/hotfix/4.4-7006' into 4.4 2014-08-18 20:23:58 +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
Vincent Bernat 5a68f031ce CLOUDSTACK-7193: handle domain ID being an int 
Recent versions of libvirt (at least 0.9.8) will return an int when
queried for the ID of a domain, not a string. This breaks some parts of
the `security_group.py` script which expects a string containing an
int. Notably, this breaks the part handling VM reboots which is
therefore not executed.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-08-18 10:45:53 -04:00
Olivier Lemasle 23b8196445 CLOUDSTACK-7006: Restore template ID in ROOT volume usages 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-08-18 10:18:06 -04: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
Pierre-Luc Dion 62d9843e0c NfsSecondaryStorageResource.java:remove empty spaces 2014-08-14 13:07:32 -04:00
Pierre-Luc Dion 29c12bb78c CLOUDSTACK-7343; fix create folder in copyFromSwiftToNfs 2014-08-14 10:15:27 -04:00
Joris van Lieshout c4d1bf7f24 sysctl improvements. 1. ip_nonlocal_bind for smooth transition in case of a keepalived failover. 2. panic settings so that a vm dies in a way that ACS understands it's down. 3. also up the nf_conntrack limits. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 45deade1df)

Conflicts:
	systemvm/patches/debian/config/etc/sysctl.conf
 2014-08-14 14:00:23 +02:00
Brenn Oosterbaan 8b7130fa65 CLOUDSTACK-7345 changed dd blocksize to 128k when using NFS. 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-08-14 09:59:48 +02:00
Rohit Yadav 47fee57312 CLOUDSTACK-4770: In MacAddress skip macAddress when parsed value is 0x00 
In MacAddress class, we start by settig macAddress String as null and go through
the output of ifconfig -a and pick the one string that is a valid mac address
but is not 0x00 and 0xff. With each loop we set the macAddress to null so that
it does not pick the last one if everything fails.

Tested on Ubuntu where I had an interface called cloud0 whose mac id was 0x00
and it was skipped to get the next one:

$ java -classpath <path-to-cloud-utils.jar> com.cloud.utils.net.MacAddress
addr in integer is 5071953436
addr in bytes is  0 1 2e 4f de 1c
addr in char is 00:01:2e:4f:de:1c

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 3b5aa42c6d)
 2014-08-13 21:10:19 +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
Joris van Lieshout c4b78c3aaa dd with direct io is less impacting on Dom0 kernel resources 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-08-12 13:15:00 +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
Hugo Trippaers 9a7cdc0adb Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to fix their links 
(cherry picked from commit 8b5ec64842)
 2014-08-11 15:58:38 +02:00
Rohit Yadav edb5650c73 appliance: box commands for dumb bash in cleaning branch name, in build.sh 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-08 21:23:25 +02:00
Jessica Wang d0ff6cd461 CLOUDSTACK-6695: Added support to the UI for uploading a chain of certificates 
In the "SSL Certificate" dialog we added:
- new field for the root certificate;
- a button to add intermediate certificates if necessary; when this is pressed, a new field, called "Intermediate certificate 1" is added; pressed again, "Intermediate certificate 2" field is added, and so on.

We upload the certificates in order: first the root certificate (with id=1), then the intermediate certificates (with id=2,3,..) and finally the server certificate.
When uploading a certificate, we wait for the upload to be completed successfully and only then we proceed to uploading the next one. If one fails, we report failure and don't continue with the remaining.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-08-08 11:39:38 -07:00
Rohit Yadav bbaefb8e5d appliance: fix branch finding method from e16414e even Junio can be wrong 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-08 20:27:00 +02:00