apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,835 Commits 304 Branches 324 Tags
Commit Graph

274 Commits

Author SHA1 Message Date
Naredula Janardhana Reddy
cbed4c7a44 bug 11253: 
Added New value "link-local"  to  global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
       global -  stats visible from public network
       guest-network - stats visible only to guestnetwork.
       link-local - stats visible only to link local network
       disabled - stats disabled.
 2011-08-26 15:21:29 +05:30
alena
a11b7de9fe Set firewall.rule.ui.enabled to false by default 
Conflicts:

	server/src/com/cloud/configuration/Config.java
 2011-08-25 16:12:55 -07:00
Kelven Yang
97a7dddf7d bug 11162: support memory overprovisioning in VMware 2011-08-25 15:38:28 -07:00
Naredula Janardhana Reddy
145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
alena
8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
frank
18f87c2108 Merge branch 'cvm' into 2.2.y 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-19 16:08:35 -07:00
keshav
8dd86ff803 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 18:19:52 -07:00
keshav
57f1ee7ca1 Added configuration parameter to enable/disable the firewall rule UI. 2011-08-10 16:06:32 -07:00
Kelven Yang
eb28549e6c Seperate template cleanup control to enable template preloading 2011-08-09 13:42:50 -07:00
Kelven Yang
fe9ccf33b5 Seperate template cleanup control to enable template preloading 2011-08-09 13:38:27 -07:00
Chiradeep Vittal
924961d898 merge nectarine 2011-08-08 21:45:37 -07:00
Kelven Yang
02e64f90de Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:45:47 -07:00
Kelven Yang
39a3d82f11 Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:37:26 -07:00
Chiradeep Vittal
8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
frank
6aaf3d5ae0 Merge branch 'cvm' 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-08 14:14:09 -07:00
Chiradeep Vittal
1e82b65983 Ensure upgrade picks up new db configs 2011-08-05 18:13:52 -07:00
Abhinandan Prateek
7e727be42c bug 10748: use external dnses if set thru global config (dhcp otpion 6) 2011-08-03 12:34:02 +05:30
alena
8d47c53735 Revert "bug 10435: removed vpn feature" 
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2011-08-02 18:12:57 -07:00
Chiradeep Vittal
e725c8ffeb Ensure gc is slower, make some configs visible 2011-08-02 17:16:57 -07:00
Alex Huang
f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Abhinandan Prateek
2f804dd799 bug 10748: use external dns, configurable thru global param 2011-08-02 16:21:55 +05:30
Abhinandan Prateek
9009026eba bug 10748: use external dns 
status 10748: resolved fixed
 2011-08-02 15:35:13 +05:30
Chiradeep Vittal
efaa63a428 bug 10884: try out a global lock instead of per-vm locks 2011-08-01 18:52:06 -07:00
Chiradeep Vittal
0ee45261e7 set a flag so that api clients know whether to use the elb api 2011-07-27 16:00:59 -07:00
Chiradeep Vittal
8cc694a579 bug 10884: bump up thread pool and cleanup less often 2011-07-27 14:44:52 -07:00
Naredula Janardhana Reddy
3c66075b8b bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config 2011-07-27 14:06:26 +05:30
Naredula Janardhana Reddy
93680fdc9e Bug:10557 2011-07-27 14:05:47 +05:30
Naredula Janardhana Reddy
f0b1f3d229 bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config 2011-07-27 13:42:14 +05:30
Naredula Janardhana Reddy
96bacb85f8 Bug:10557 2011-07-25 17:40:33 +05:30
alena
d6112b1632 Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks" 
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-07-21 16:04:55 -07:00
alena
b1d5b5a51d 2 fixes for Agent Load Balancer: 
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default
 2011-07-21 15:43:52 -07:00
alena
ee98887176 2 fixes for Agent Load Balancer: 
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	setup/db/db/schema-228to229.sql
 2011-07-21 15:28:11 -07:00
alena
307741edcd 2 fixes for Agent Load Balancer: 
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default

Conflicts:

	server/src/com/cloud/configuration/Config.java
	setup/db/db/schema-228to229.sql
 2011-07-21 15:27:50 -07:00
alena
3167c49687 bug 10736: when deploy vm in Basic zone, 1) send vmData/Password info to the Dhcp running in the same pod 2) send dhcp information to all pods in the system only when network.dns.basiczone.updates has "all" value 
status 10736: resolved fixed
 2011-07-20 16:50:58 -07:00
alena
36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
kishan
28119036b8 bug 10398: Added scheduled job, alert and interval config param for usage sanity check 2011-07-20 17:20:11 +05:30
Sheng Yang
978b2640e2 Backport VirtualNetworkApplianceManager 
Also:
1. Discard VPN related change.
2. Add network.dns.basiczone.updates in Config.java
3. Add findByNetworkOutsideThePod() for DomainRouterVO

Tested with VLAN and basic mode, works.

Disable redundant virtual router temporaily, would enable it after more testing.
 2011-07-18 18:30:05 -07:00
Sheng Yang
4bc8686513 bug 10429: Backport redundant virtual router 
Part 1

This backport contained:

commit 52317c718c25111c2535657139b541db0c9d1e1f
    bug 9154: Initial check in for enabling redundant virtual router

commit 54199112055d754371bfb141168fb5538bf6d6ea
    Add host verification for CheckRouterCommand

commit cef978a228c90056ead9be10cbc4de74c2b8de76
    Fix CheckRouterAnswer's isMaster report

commit 4072f0a6991ac3b63601a1764fbe14188965f62f
    Some build fixes and code refactoring for redundant router

commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
    Redundant Router: Fix OVS

commit 6a228830e7c46d819fa0c3317e159e041337e887
    Fix findByNetwork()/findByNetworkAndPod()'s return

commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
    Redundant Router: Fix isVmAlive()

commit e1275d2514adc41f8744f5107d4069c38be195f1
    Only issue CheckRouterCommand to redundant routers

And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes

in the master branch.
 2011-07-18 18:29:56 -07:00
Nitin
149c8d4b03 bug 9596: Extract Template/ISO - make extractable = false by default. Make changes to cleanup the extract URL's for multiple sec. storage. 
status 9596: resolved fixed
 2011-07-18 10:28:59 -07:00
Nitin
b3957d525b bug 9596: Extract Template/ISO - make extractable = false by default. Make changes to cleanup the extract URL's for multiple sec. storage. 
status 9596: resolved fixed
 2011-07-18 12:10:51 +05:30
alena
93090d867d bug 10297: make default page size unlimited (-1) 2011-07-15 16:02:37 -07:00
alena
15aa7d9102 bug 10297: make default page size unlimited (-1) 2011-07-15 16:01:44 -07:00
Kelven Yang
281201be8e Make cluster request timeout to be configurable 2011-07-14 18:23:23 -07:00
Kelven Yang
61676ff3ea Make cluster request timeout to be configurable 2011-07-14 18:11:32 -07:00
alena
731c3bc20a bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all" 
status 10710: resolved fixed
 2011-07-14 16:28:13 -07:00
Kelven Yang
399e6a673b bug 10577: implemente VMware CPU reservation based on CPU overprovisioning factor 2011-07-05 18:05:17 -07:00
Kelven Yang
51f93a6020 bug 10577: implemente VMware CPU reservation based on CPU overprovisioning factor 2011-07-05 17:34:38 -07:00
alena
17f785f07a Intermidiate checkin for Projects feature; added 3 new apis - create/delete/listProject(s) - as a part of checkin 2011-07-01 13:19:12 -07:00
Kelven Yang
217ab1a851 bug 10150: we need to be told about management network group name for ESXi to pick up the correct one when there are multiple VMKernel ports be configured in vCenter 2011-06-24 18:13:53 -07:00
Kelven Yang
6cdbd1f2bb bug 10150: we need to be told about management network group name for ESXi to pick up the correct one when there are multiple VMKernel ports be configured in vCenter 2011-06-24 18:12:25 -07:00