Commit Graph

23 Commits

Author SHA1 Message Date
anthony a6b9027630 default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC

CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
Alena Prokharchyk d9fd7e02a5 Plug nic support
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Kelven Yang a59658177d bug 11814: connect template and instance details data when sending command to resource 2011-11-18 16:40:31 -08:00
Alex Huang 84d5f0514e Changed network tags to network name as we no longer need to send the entire network tags down to the resource. 2011-11-18 14:28:16 -08:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
Kelven Yang d10c8e2a1d bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:30:50 -07:00
Alex Huang 0dfc44582b bug 9651: Adding network tags
Also changes in Request logging.
2011-05-23 15:51:50 -07:00
Murali Reddy c12ccbd06f Bug 9534 : implement CPU cap
Introducing new boolean flag in service offering to restrict the user VM's CPU utilization to what service offering it is entitled for.
2011-04-27 13:54:45 +05:30
Kelven Yang 1c9196f9af add vncPassword on hypervisor back 2011-03-23 16:18:22 -07:00
Edison Su 2705adb3b1 security group is per bridge 2011-02-28 12:16:40 -05:00
Kelven Yang 8695e7250c Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
Alex Huang 0105c03a27 initial HA work 2011-02-04 11:51:14 -08:00
alena 671cce23ad bug 7704: network_rate is a part of network offering now. It's optional parameter; if not specified - global config param is used.
status 7704: resolved fixed
2011-01-21 09:54:27 -08:00
Kelven Yang b285bbb683 new networking change integration 2010-12-08 18:30:30 -08:00
Alex Huang 1fe446002b stop vm is now formalized 2010-11-05 16:10:22 -07:00
Alex Huang 0fdca8be9a changed back so everyone else can start the old way 2010-11-03 21:18:31 -07:00
Alex Huang e27bb550fe Harmony among gurus 2010-11-03 21:18:31 -07:00
Alex Huang 652d86956c more files checked in 2010-10-04 12:04:59 -07:00