1c96ef41c1
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 17:38:27 -07:00
4a8ffe34e2
CS-16239: don't try to pull key information if the key was removed in the system
...
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 17:38:24 -07:00
2404d3493d
CS-14277
...
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:38:15 -07:00
452e34908f
Fix the output of instance-id and vm-id to UUID
2012-09-11 17:38:06 -07:00
88f85b29c2
Replace db-id by UUID for user VM's vm-id.
2012-09-11 17:38:05 -07:00
b02551dcf6
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-11 17:38:02 -07:00
efd0905fbd
only check ISO which is downloaded status
2012-09-11 17:37:58 -07:00
e5a16f40cd
CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
...
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-11 17:37:05 -07:00
3afc9cc630
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-11 17:33:24 -07:00
e1b3f0cf87
CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.
...
- Using temp to not affect the return value for the method.
2012-09-11 17:33:00 -07:00
4e29e0d5c3
CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.
...
Making sure host disconnect is called.
2012-09-11 17:32:59 -07:00
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
86427559cb
CS-16269: Fix savePassword on one stopped RvR
2012-09-05 13:46:44 -07:00
51cc301fef
CS-16222: send password reset command only to the element responsible for the userdata service in network
...
Reviewed-by: Sheng Yang
2012-09-04 13:41:10 -07:00
f509efe2d8
cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian)
2012-09-04 11:43:29 -07:00
dd07d1598f
Fix Bug CloudStack-9 can not change OS preference from OS to none
2012-09-04 20:51:03 +08:00
73cc474157
add secondary storage provider
2012-09-02 19:26:20 -07:00
083cef37f1
CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Reviewed-By: Alena
Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
2012-08-31 13:40:18 -07:00
3d0069bb56
CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Changes:
There is an unnecessary search over capacity table that scans entire table.
2012-08-31 13:40:17 -07:00
39a676c496
Correct license header mainly for patches folder
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree. If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
2012-08-31 10:50:46 -04:00
2fd99fe955
Deleted files
2012-08-30 09:59:27 -07:00
f7acd8fed8
Create random version for StartupCommands in dev env setup
2012-08-30 08:47:02 +02:00
79ebffe4f3
CS-13594: Download template is unable to handle multiple SSVMs per zone
...
Reviewed-by: Kishan
2012-08-29 15:25:00 +05:30
eb4a3cf6c8
bug CS-15398: fix for basic zone dns issue in multiple pods
2012-08-29 14:33:27 +05:30
f218003607
Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack
2012-08-28 23:30:57 +02:00
8c3450b503
CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.
2012-08-28 13:52:42 -07:00
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
5e0ede8bd9
bug 13946: reducing poll interval
2012-08-28 12:22:46 +05:30
38e26f8dbd
IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to
...
Reviewed-by: Sheng Yang
2012-08-27 16:26:32 -07:00
82cb1095dc
CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account
...
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-27 16:11:36 -07:00
fbdc7fc59f
CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network
...
Reviewed-by: Sheng Yang
2012-08-27 13:46:36 -07:00
48806fcc54
VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-27 11:11:55 -07:00
3609e44b58
commit for https://reviews.apache.org/r/6608/
2012-08-27 10:39:49 -07:00
0d9b81aac6
that was an unused import not a missing dependency
2012-08-25 00:44:14 +02:00
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
e3f2cf908a
Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor
2012-08-24 15:57:18 +02:00
a08ae8e42c
[ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks
...
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-23 18:18:12 -07:00
aec6b4af48
[ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates
2012-08-23 17:52:04 -07:00
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
3298a481a8
For assignVM, marking older snapshots removed in db
2012-08-23 12:22:02 +05:30
6f26894eaf
Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters).
2012-08-23 12:13:53 +05:30
3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
a5248f1cfc
Fix for dns issue in multiple pods
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
b42a813ff1
bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh
...
status CS-16112: resolved fixed
Conflicts:
patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
2012-08-22 12:00:02 +05:30
0b31a0af62
[ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0
2012-08-21 16:27:57 -07:00
4bffd71d71
[ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch.
2012-08-21 16:27:54 -07:00
cd0004bb86
CS-16111 - DB upgrade; fixed foreign keys names
2012-08-21 15:38:17 -07:00
e252de4999
PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
...
Reviewed-by: Frank Zhang
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
Likitha Shetty
Alena Prokharchyk
Koushik Das
Fang Wang
Anthony Xu
Rohit Yadav
Edison Su
Prachi Damle
Alex Huang
Sheng Yang
Jessica Wang
Mice Xia
Gavin Lee
Darren Shepherd
Nitin Mehta
Jayapal
olivier lamy
Abhinandan Prateek
Kelven Yang
Darren Shepherd
Hugo Trippaers
kishan