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
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
Jason Bausewein
0449ae37f1
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
Murali reddy
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
Brian Federle
5fafb0e5e5
CS-15313: Error handling for account section
...
This fixes an issue where an error is not displayed when entering an
invalid account name.
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-02 11:01:38 -07:00
Brian Federle
b70bc92f46
CS-14907: Only allow download volume for uploaded volumes
...
This fixes an issue where an uploaded volume that hasn't been moved to
primary storage yet is downloaded, causing an error. This adjusts the
actionFilter to fix this.
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-02 10:41:35 -07:00
David Nalley
de04b8cb79
stopgap to fix the RPM issues created by the plugins
...
Patch by Hugo Trippaers
https://reviews.apache.org/r/5697/
2012-07-02 13:31:38 -04:00
Murali reddy
8aa2b55dd6
moving out NetApp code to plugins/file-systems/netapp
2012-07-02 08:34:02 -07:00
David Nalley
1581d65c99
License header updates for the core folder from Chip Childers
...
https://reviews.apache.org/r/5705/
2012-07-02 09:54:47 -04:00
David Nalley
9aa0edf7a4
License header updates for the ovm folder from Chip Childers
...
https://reviews.apache.org/r/5706/
2012-07-02 09:52:55 -04: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
David Nalley
ae4b66283a
cleaning up some line endings
2012-07-02 09:50:28 -04:00
David Nalley
91fd3b772e
Applying patch from Prasanna Santhanam
...
Marvin sandbox example scripts for generating one host configurations
https://reviews.apache.org/r/5656
2012-07-02 09:08:51 -04:00
Chip Childers
4533f678a5
License header updates for the plugins/hypervisors/ovm folder.
2012-07-02 09:02:30 -04:00
David Nalley
ad3ae753dd
Patch from Hugo Trippaers
...
https://reviews.apache.org/r/5698
CentOS 6.2 ships tomcat6-el-2.1-api-6.0.24.jar with tomcat just like RedHat
2012-07-02 09:00:06 -04:00
Chip Childers
e934f6f825
Licence header updates for the core folder.
2012-07-02 08:58:48 -04:00
Chip Childers
8f71a2927f
License header updates for the server folder.
2012-07-02 08:58:10 -04:00
Wido den Hollander
1a2f354f4d
Remove message about contacting Cloud support.
...
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00
David Nalley
e9c166a44f
removing docs stuff
...
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-06-30 14:10:45 -04:00
David Nalley
e27e49a21a
defenestrating all of the binary docs blobs
2012-06-30 14:10:33 -04:00
Brian Federle
49c3c8b2e3
VPC UI: Add link to site-to-site VPN
...
Add link in tooltip for site-to-site VPN, which opens a new panel
showing the list view. This draws from the existing 'siteToSiteVpn'
network subsection, so no modification should be required to the
existing list view.
2012-06-29 13:36:07 -07:00
Brian Federle
683b7d7822
Add configure VPC tooltip and links
2012-06-29 13:13:59 -07:00
Brian Federle
f026387103
Add configure icon to VPC
2012-06-29 13:13:59 -07:00
Hugo Trippaers
3f534b8194
dao objects for OVS are in com.cloud.network.ovs
...
Fixes regression of moving Ovs code to plugins/network-elements/ovs
2012-06-29 11:12:22 -07:00
David Nalley
4c5a3be1a8
clarifying what we are really doing
2012-06-29 13:18:41 -04:00
David Nalley
1fa77d7fc8
adding license headers to all of the content files
2012-06-29 13:08:03 -04:00
David Nalley
178569b3a9
adding some documentation on the runbook itself
2012-06-29 13:03:01 -04:00
David Nalley
3ae274a47c
adding runbook and publican-cloudstack to docs
2012-06-29 11:16:18 -04:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00