Alex Huang
8d21f49ec9
Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged
2013-07-03 15:01:23 -07:00
Harikrishna Patnala
e63ac5512e
CLOUDSTACK-3324: Fix/Improve upgrade system vm template 41 to 42
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 17:18:25 +05:30
Murali Reddy
2f3764ef94
CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
...
involved in the GSLB
add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Alena Prokharchyk
4f89c88985
41-42 DB upgrade: fixed physicalNetworkUpdate method - one of the preparedStatement elements wasn't set
2013-07-01 12:00:54 -07:00
Alex Huang
57bafc8fe9
Another merge from master. This is just getting laborious
2013-07-01 11:29:57 -07:00
Min Chen
87c401aaaf
CLOUDSTACK-3144: [Automation] Deletion of templates failing. Fails to
...
find image store housing template.
2013-06-28 17:57:42 -07:00
Mike Tutkowski
99227f7b3e
SolidFire plug-in and related changes
...
SolidFire plug-in
SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Prachi Damle
02ab2eb384
Revert "Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries"
...
This reverts commit 7f2f25d640 .
2013-06-28 14:58:32 -07:00
Bharat Kumar
6b0df2566d
Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar
7f2f25d640
Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:54 +05:30
Kishan Kavala
87a5dc582e
encrypt vnc_password for removed Vms also. Snapshots of removed Vms still refer Vm VOs
2013-06-28 11:13:02 +05:30
Alena Prokharchyk
5437a0d058
CLOUDSTACK-3126: don't count system network (private gateway's network) when calculate networks count in the vpc
2013-06-27 17:10:14 -07:00
Alex Huang
262352a1c6
Another merge from master to bring over fixes to bugs that broke the bvt
2013-06-27 11:16:32 -07:00
Kishan Kavala
f96442a45b
CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm
2013-06-27 16:01:39 +05:30
Murali Reddy
ff167134e4
CLOUDSTACK-3214: transferring portable IP across zones with enableStatic
...
NAT does not work
making an exception for portabe IP, so that if the current datacenter with
portable IP is associated is different from destiantion data center
also on transfer on to new zone, transfer the portable ip association to
new data center, physical network id's
2013-06-26 19:29:55 +05:30
Nitin Mehta
1c102a0589
CLOUDSTACK-2835: Change function from execute to executeUpdate
2013-06-26 17:47:17 +05:30
Harikrishna Patnala
c0591531d8
CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in not considering overcommit factor. cluster is getting disable based on actual use
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:02:21 +05:30
Harikrishna Patnala
9385cf0453
CLOUDSTACK-2835: VR Deployement from admin registered template is failing because registered template type is user. Additional parameter "isrouter" in register/update template API for the root admin. True if registered template is of type ROUTING.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:00:12 +05:30
Alex Huang
241d54696e
Migrate bugs fixed
2013-06-25 16:49:56 -07:00
Alex Huang
5bd65daa03
How did these things actually pass in master
2013-06-25 13:32:37 -07:00
Alex Huang
7b7db0560c
merge is complete
2013-06-24 16:50:31 -07:00
Alex Huang
95fe42cc7c
Migration work
2013-06-24 10:16:37 -07:00
Kishan Kavala
da0006618f
CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion
2013-06-24 17:58:29 +05:30
Jayapal
6a7ae637dd
CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider
2013-06-24 13:37:00 +05:30
Kelven Yang
340e1da4c4
Fix test cases in OSS build caused by CallContext changes
2013-06-20 18:03:08 -07:00
Alena Prokharchyk
ae6e8b448f
CLOUDSTACK-3085: network implement - deploy internal lb vm for the ip only when:
...
* the load balancer contains lb rule in state "Active"
* when lb rule has at least one vm assigned to it
2013-06-20 13:01:32 -07:00
Edison Su
205722aabf
fix nonoss build
2013-06-20 10:47:19 -07:00
Edison Su
97f8c524b8
merge object_store
2013-06-20 00:18:00 -07:00
Harikrishna Patnala
7b6b8d7a07
CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
...
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su
9aec9c605c
merge to master
2013-06-19 18:16:47 -07:00
Kelven Yang
0bfc817bc6
Handle transitional states across management server restart
2013-06-19 17:47:14 -07:00
Wei Zhou
10e80afdeb
remove duplicated VPC router in return value of functions in DomainRouterDaoImpl
2013-06-18 15:29:46 +02:00
Wei Zhou
882220e802
CLOUDSTACK-1301: VM Disk I/O Throttling
2013-06-18 10:02:55 +02:00
Alex Huang
e2edae1711
Merge from master
2013-06-17 19:00:44 -07:00
Alex Huang
3a074f31ae
Removed a bunch of useless classes. Move configuration into utils package
2013-06-17 17:04:04 -07:00
Alex Huang
aad2bc78c1
Completely Isolated job manager from user
2013-06-17 17:04:03 -07:00
Alex Huang
ea6ca5ff5c
Removed AsyncJobConstant
2013-06-17 17:04:01 -07:00
Alena Prokharchyk
5d0a1cee13
CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already)
2013-06-17 16:13:19 -07:00
Jessica Wang
880029844b
CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API.
2013-06-17 16:08:38 -07:00
Min Chen
cf43344541
Fix build error
2013-06-17 13:48:02 -07:00
Likitha Shetty
770cf02ccf
Global config to disable an account from acquiring public ips and guest vlans from the system if the account
...
has dedicated resources and the dedicated resources have all been consumed - use.system.public.ips and use.system.guest.vlans
Both configs are configurable at the account level too.
2013-06-17 17:54:36 +05:30
Edison Su
f41c800d88
merge to master
2013-06-14 19:06:33 -07:00
Min Chen
bb85a564da
Remove state from vm_template table, we should use template_store_ref
...
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Min Chen
c5083a385f
Migrate NFS secondary storage data from 4.1 to 4.2.
2013-06-14 10:54:41 -07:00
Kelven Yang
0f26d5a050
Add skeleton to support out-of-band sync and recovery from left-over transitional VM states
2013-06-12 17:14:54 -07:00
Min Chen
80ed9254b6
Fix db creation issue caused from merge conflict.
2013-06-12 15:37:21 -07:00
Kelven Yang
35ea8e149d
Fix errors in bringing up user VM under new VMsync framework
2013-06-12 12:05:26 -07:00
Min Chen
18aeef3ef1
Merge branch 'master' (up to commit
...
c30d9be3ce ) into object_store.
2013-06-12 11:20:32 -07:00
Kelven Yang
f2717207aa
Fix several assert revealed bugs
2013-06-12 09:45:06 -07:00
Harikrishna Patnala
a30f9fa64a
Fix for CLOUDSTACK-1704 and CLOUDSTACK-1622
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 15:01:59 +05:30