etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,989 Commits 324 Branches 325 Tags 795 MiB
Commit Graph

16989 Commits

Author SHA1 Message Date
Hugo Trippaers 6cc8896f96 package statement was removed during a license update 2012-07-06 10:03:51 -04:00
Edison Su 57ab39937c add script to setup devcloud image 2012-07-05 20:36:43 -07:00
kishan 470cd120d1 Added ASF license 2012-07-05 12:28:15 -07:00
Alena Prokharchyk 81afcabdb2 Added missing package name mistakenly removed by headers cleanup checkin 2012-07-05 11:12:02 -07:00
David Nalley 471924ff11 adding a high level overview 2012-07-05 10:56:10 -04:00
David Nalley 27a23b2e2a committing some bugfixes to runbook - thanks to Watnuss for pointing them out on IRC 2012-07-05 10:38:55 -04:00
David Nalley a77b6756fc more cleanups of license headers and attribution 2012-07-04 21:48:07 -04:00
David Nalley 5c3a8cd490 more license header cleanups 2012-07-04 21:41:50 -04:00
David Nalley c0d5f86356 a bit more license header cleanup 2012-07-04 19:53:04 -04:00
David Nalley 53d5fe6636 fixing another license header 2012-07-04 19:47:12 -04:00
David Nalley 6fe595f3d3 committing some more changes to marvins license headers 2012-07-04 18:50:49 -04:00
David Nalley 54d7a10b99 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-04 18:45:34 -04:00
David Nalley ecf2cd57f9 fixing license headers in marvin 2012-07-04 18:45:08 -04:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Edison Su 1f8e99439c move to devcloud 2012-07-03 23:38:39 -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
Alena Prokharchyk f2078afbd8 VPC: added zoneName to the VPC api response 2012-07-03 17:28:20 -07:00
Alena Prokharchyk 07d478d836 VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:27:46 -07:00
Vijayendra Bhamidipati 023c2e4f59 Encrypting password values that are stored in the cluster_details table 2012-07-03 17:27:21 -07:00
Vijayendra Bhamidipati b957933a0e Making nexus vsm password encryptable 2012-07-03 17:26:05 -07:00
Alena Prokharchyk 5afa83abb6 VPC: CS-15355 - fixed router when deployVm in Basic zone 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:25:07 -07:00
Alena Prokharchyk 21d87f3fa5 VPC: fixed response tag for VpcRespnse 2012-07-03 17:23:50 -07:00
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
 2012-07-03 17:23:40 -07:00
Alena Prokharchyk 2b799aa9ac VPC: added missing FirewallService to the VR provider 2012-07-03 17:22:41 -07:00
Edison Su 57927c9f23 From: jason.bausewein@tier3.com 
Updated script to create cloud_usage database similar to deploy-db-dev.sh.
 2012-07-03 15:16:51 -07:00
kishan b5563e832e Add Region APIs 2012-07-03 13:06:21 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
kishan ccf15cb5f6 Add Region APIs 2012-07-03 12:59:28 -07:00
Edison Su 217fdd2497 From: jason.bausewein@tier3.com 
Fixed deployDataCenter.py to select the correct network offering based on if security groups are enabled.  Also added default value to configGenerator.py for basic setup.
 2012-07-03 12:56:42 -07:00
Alena Prokharchyk 5bcf73080a Merge branch 'master' into vpc 2012-07-02 17:47:01 -07:00
Alena Prokharchyk 580261119c VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin) 
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 5d5b584a8e VPC: remove network ACLs from VPC VR when shutdown guest network 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 40a3482f13 VPC: multiple fixes: 
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 183633cf70 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed) 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-02 17:44:28 -07:00
Alena Prokharchyk 1ee0c30935 VPC: added vpccidr to the list of VPC router bootload args 2012-07-02 17:44:27 -07:00
Alena Prokharchyk 2dc1a286f6 VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC 
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-02 17:44:27 -07:00
Sheng Yang 8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang 5ee4b79688 CS-6840: Fix 0 id returned by createVpnConnection 2012-07-02 16:29:34 -07:00
Sheng Yang 1d97af3abf CS-6840: Add status checking for site 2 site VPN 2012-07-02 16:29:23 -07:00
Sheng Yang d9688f74ba CS-6840: List all objects without require parameter 2012-07-02 16:29:10 -07:00
Sheng Yang 3995dc9cb1 CS-6840: Fix wrong command name 2012-07-02 16:28:54 -07:00
Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2012-07-02 16:28:44 -07:00
Sheng Yang cd9854336a CS-6840: Update ipsectunnel.sh 2012-07-02 16:27:38 -07:00
Clayton Weise df062f1fe8 CS-6840: Add ipsectunnel script 2012-07-02 16:27:35 -07:00
Sheng Yang 0ce1e78364 CS-6840: Add Site2SiteVpnServiceProvider 2012-07-02 16:27:09 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00
Sheng Yang 9bb65b1126 CS-6840: Add data structure for site-to-site vpn tables 2012-07-02 16:20:58 -07:00
Sheng Yang 78b31bb7db CS-6840: Add tables for site to site VPN use. 2012-07-02 16:20:53 -07:00
Deepti Dohare c8bbf04c81 CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-03 04:35:53 +05:30