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

1278 Commits

Author SHA1 Message Date
Daan Hoogland e9441d4786 Updating pom.xml version numbers for release 4.4.3 
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
 2015-04-15 17:00:24 -05:00
Nitin Mehta c2dc53c2a1 Avoid distributing private key for realhostip.com 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/AgentHookBase.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
 2015-03-18 20:35:18 +01:00
Harikrishna Patnala a3069ac02a CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false 
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
 2015-03-12 14:54:02 +01:00
Rohit Yadav c4c783727d CLOUDSTACK-7639: make cidr updation more efficient 
check and update only when required

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b879916f5c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 16:30:29 +05:30
Rohit Yadav bba292f24d CLOUDSTACK-7639: make cidrlist update when updateNetworkAclItem is called 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b2b9de7fa3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 16:30:26 +05:30
Daan Hoogland fbafc957dc CLOUDSTACK-8238 handling of retry ping improved 2015-02-10 14:36:55 +01:00
Daan Hoogland 1f209ff226 CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:59:40 +01:00
Rohit Yadav 0269456152 CLOUDSTACK-8160: use preferable protocols 
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
 2015-01-21 18:11:38 +05:30
Abhinandan Prateek 7699c70ade CLOUDSTACK-8164: Look for all host to avoid NPE 
(cherry picked from commit d8def3dc0b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-19 11:32:52 +05:30
Rohit Yadav ea3fb82f8f engine/storage: add NPE check, break if parent snapshot is null 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c06ca09b54)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:21:18 +05:30
Daan Hoogland 1c78d5acc5 upgrade path 2015-01-09 16:10:06 +01:00
Daan Hoogland 8cf67c0bf7 logging in clustering code, to find faulty vif plug on xenserver from clustered ms on nic orchestration for start command 2015-01-05 12:57:00 +01:00
Likitha Shetty 4807fa7de6 CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true. 
Before registering a VM check if a different CS VM with same name exists in vCenter.

(cherry picked from commit 33179cce56)
 2014-12-23 21:52:23 +01:00
Likitha Shetty 9be404a93e CLOUDSTACK-8107. Failed to create snapshot from volume when the task is performed repeatedly in zone wide primary Storage. 
While taking a snapshot of a volume, CS chooses the endpoint to perform backup snapshot operation by selecting any host that has the storage containing the volume mounted on it.
Instead, if the volume is attached to a VM, the endpoint chosen by CS should be the host that contains the VM.

(cherry picked from commit a75a431373)
 2014-12-23 16:25:00 +01:00
Koushik Das 145b4a1f2c CLOUDSTACK-8103: Vmsync marks VM as stopped even after failing to stop it in HV 
During vmsync if StopCommand (issued as part of PowerOff/PowerMissing report) fails to stop VM (since VM is running on HV),
don't transition VM state to "Stopped" in CS db. Also added a check to throw ConcurrentOperationException if vm state is not
"Running" after start operation.

(cherry picked from commit 788fe5a273)
 2014-12-23 16:04:46 +01:00
Edison Su 0e312a7a77 CLOUDSTACK-7301, CLOUDSTACK-7947: double check if parent snapshot is removed or not 
when creating new snapshot, check if parent snapshot is removed or not

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

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java

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

Conflicts:
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
 2014-12-18 18:27:56 +05:30
Rohit Yadav 2f2ff4bfc0 engine: Fix build regression 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-12 21:49:11 +05:30
Rohit Yadav 94cad49e07 CLOUDSTACK-8070: during 4.4.2 to 4.4.3 upgrade encrypt config that are hidden 
In case there is an encryption key/password is provided the value, specifically
for router.ram.size will be encrypted otherwise it will remain plain text.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-12 20:43:53 +05:30
Min Chen 2de93881c7 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in 
VolumeDataStoreVO.
(cherry picked from commit 672bb353be)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-11 20:48:06 +05:30
Min Chen 38bc20e67f CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql 
(cherry picked from commit cd8af6a3e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
 2014-12-11 20:47:57 +05:30
Murali Reddy 908ee8e01a CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of 
cleanup the rules then destroy

fix adds a provision to specify if cleanup is needed on network on
shutdown. VR is marked as to not to require network rules clean up on
network shutdown as the VR is destroyed and recreated.

ran the simulator tests that test network life cycle

(cherry picked from commit 67876b215e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-11 20:39:33 +05:30
Min Chen e9311bf528 CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed 
operation.

(cherry picked from commit 1e20600eca)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-11 20:36:18 +05:30
Jayapal c6ef739e25 CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network 
(cherry picked from commit 709bf074de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
 2014-12-11 20:35:30 +05:30
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
Daan Hoogland 9b76342a23 upgrade path(s) 2014-11-28 23:50:30 +01:00
Hiroki Ohashi d15033675b CLOUDSTACK-7412: Can't create proper template from VM on S3 secondary storage environment 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-11-27 17:05:12 +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 46ece087ee Merge remote-tracking branch 'origin/4.4-RC20141121T0341' into 4.4 2014-11-25 15:30:26 +01:00
Likitha Shetty 54ebbe55a7 CLOUDSTACK-7415. Host remains in Alert after vCenter restart. 
Management server PingTask should update PingMap entry for an agent only if it is already present in the Management Server's PingMap.

(cherry picked from commit 8ce6eba549)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 59ce63918e)
 2014-11-21 14:42:17 +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
Rohit Yadav 73c62837b5 schema: Add upgrade paths from 4.3.2 to 4.4.0 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-20 14:11:25 +05:30
Daan Hoogland 5578616143 4.4.2 upgrade schema 2014-11-13 20:01:35 +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 f1e2312523 whitespace 2014-10-09 11:07:29 +02:00
Daan Hoogland 1de10dd6df CLOUDSTACK-7674 throw an exception when encountered 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to431.java
 2014-10-09 11:01:18 +02:00
Daan Hoogland a29f954a26 CLOUDSTACK-7184 retry-wait loop config to deal with network glitches 2014-09-18 08:55:23 +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
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
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
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
Min Chen e454acc2c0 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in 
VolumeDataStoreVO.
 2014-09-03 21:36:48 -07: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
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
Daan Hoogland 21a6a6993e remove update to 4.3 templates for 4.4 2014-08-05 17:48:58 +02:00
Daan Hoogland 00c2696e7a upgrade of systemvm templates 2014-08-04 14:12:58 +02:00
Daan Hoogland 86083216de close statement 2014-08-04 12:30:38 +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