320 Commits

Author SHA1 Message Date
Bharat Kumar
d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Bharat Kumar
dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Sheng Yang
86bbe211f2 CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
2013-07-16 17:26:51 -07:00
Prachi Damle
fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle
661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Min Chen
2d30f42d0f After upgrade to 4.2.0, restart of system vms and router vm fails with a
NPE.
2013-07-15 15:37:08 -07:00
Edison Su
8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su
0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Likitha Shetty
aaaf168f5a CLOUDSTACK-2757. When configs are added the value of the property 'category' is not persisted. 2013-07-12 16:50:30 +05:30
Harikrishna Patnala
5dd1a1dd8e CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update template API Previuos commit: 7b6b8d7a077478620232ea1ac4ec2304289e8661 This fix is due to some changes made by the merges after this commit.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-12 15:19:25 +05:30
Saksham Srivastava
bdc7e4ce33 CLOUDSTACK-3094: Adding a shared network to already deployed VM is failing.
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-07-12 14:30:10 +08:00
Sanjay Tripathi
429e6bd4bb CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.
User should be able to delete/archive alerts and events by selecting a time period or by
choosing the alerts and events older than a date. Added the ability to choose a time period
too.
2013-07-11 14:12:17 +05:30
Koushik Das
aed49572c7 CLOUDSTACK-2918: In a scaled up environment, hosts fail to come up after Management server restart in clustered set up
Summary of changes in the fix
- Optimized host scan logic, now instead of iterating over each cluster host scan is done for a batch of clusters
- Made host scan task interval configurable
2013-07-10 12:13:24 +05:30
Mike Tutkowski
06f73092fb Changes related to Review Board comments 2013-07-09 22:50:14 -06:00
Sheng Yang
7d8f6c7022 CLOUDSTACK-3417: Prevent conflict of existed foreign keys of baremetal when upgrade
Now we dropped the keys(if any) then re-add them.
2013-07-09 16:36:52 -07:00
Kishan Kavala
acb4a19633 CLOUDSTACK-2429: Multiple private gateways are allowed within a VPC. Check for conflicting routes in all gateways when adding a new static route 2013-07-09 17:27:06 +05:30
Murali Reddy
ea8b85af2a CLOUDSTACK-234: create/delete firewa/lb/pf rule: send ip assoc command
only on first rule is created on the IP and last rule is revoked on the
IP

Current suboptima logic of IP Assoc

 - On associate IP to GuestNetwork there is an IPAssoc command sent to
   corresponding network service providers of the network
 - On every rule apply on IP associated with the network send IP assoc
   to the network service providers
 - On every rule deletion on IP associated with a network sernd IP assoc
   command to the network service providers

With this fix logic of IP assoc is changed as below which eliminates
executio of unnessary and expensive IpAssocCommand resource command

 - On associate IP to GuestNetwork, associate IP only to the network,
   Untill any service is associated with the IP dont send IP Assoc
 - On creation of first rule on the IP send IPAssoc to corresponding
   network service provider. Since IP is used for a service, IPAssoc
   need to be sent to correpondign service provider
 - On deletion of last rule on the IP send IPAssoc to corresponding
   network service provider. When last rule is deleted, IP has no
   service associated with it, so send IP assoc to service provider to
   remove the IP association
2013-07-08 14:52:12 +05:30
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
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 7f2f25d640b47c8e72381bfc318a7bbbb1ca2bfd.
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
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
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
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
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
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
Min Chen
80ed9254b6 Fix db creation issue caused from merge conflict. 2013-06-12 15:37:21 -07:00
Min Chen
18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3cea30339cfff40c1002906634291b373) into object_store.
2013-06-12 11:20:32 -07:00