cbcd5cace1
S2S VPN: Add db upgrade
2012-08-13 17:37:51 -07:00
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
48b46fce5c
S2S VPN: Fix db schema issue
2012-08-13 10:26:34 -07:00
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
9adf91f7b9
CS-15879 Removed safe update flag as it is a client only setting
2012-08-12 16:34:02 +05:30
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
0ad8118562
Fixed three .classpath license header issues
2012-08-09 14:21:06 -04:00
3a6d890741
Commit for review-request: https://reviews.apache.org/r/6458/
2012-08-08 17:18:31 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
cc46d1cf3b
Adding setup/.classpath
2012-08-07 14:52:20 -04:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
2930eef00c
License header updates for the setup folder.
2012-08-03 09:49:02 -04:00
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
895b6a3e4b
CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread
...
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
2012-08-02 21:50:44 +05:30
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
3f571684aa
CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above
...
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.
Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
2012-08-01 19:39:30 +05:30
85398bb2e0
bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting
...
Reviewed-by: Kishan
2012-08-01 18:16:01 +05:30
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
3610401edc
Fail with non-zero exit code when toc category missing
2012-07-31 17:23:41 +05:30
911261a2ce
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-31 16:40:04 +05:30
b4b1a38f7e
Fix typo in create-schema.sql. comma at EOL
2012-07-31 16:39:50 +05:30
420f08ab4a
Add changes in rrq 5839 to the update script
2012-07-31 09:41:14 +02:00
0829ee164a
removing lots of web tracking stuff from apidocs stylesheets
2012-07-30 10:42:53 -04:00
048bd2e498
fixing copyright notices on apidocs
2012-07-30 10:32:07 -04:00
894407caa9
rrq 5839: This table should not have a contraint on device and physical network id. This is dealt with in the code and by using the removed field.
2012-07-30 08:46:56 +02:00
5789cd94a5
setup: Update 3.0.3 to 4.0.0 SQL update file
...
I noticed that we have pending changes for the resource tags and Nicira integration.
Adding them as a precaution, so they don't get lost.
2012-07-27 23:37:45 -04:00
72a4b2f410
S2S VPN: Add name field for customer gateway
...
Easier for user to identify the correct gateway
2012-07-27 16:27:36 -07:00
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
38a140ecb4
setup: Update 3.0.3 to 4.0.0 SQL update file
...
I noticed that we have pending changes for the resource tags and Nicira integration.
Adding them as a precaution, so they don't get lost.
2012-07-27 08:53:44 +02:00
bf2e3d6ae1
setup: Initiate SQL upgrade file from 3.0.3 to 4.0.0
...
This only adds the user_info column to the storage_pool table, but we'll probably have more SQL changes coming up.
They can all go into this file.
2012-07-26 23:03:34 +02:00
406fd95d87
Add RBD support for primary storage
...
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.
To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)
The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.
Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.
NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.
Other then these points you can run instances with RBD backed disks.
2012-07-26 22:22:26 +02:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
671475242c
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
52c145dc46
CS-15470: Remove UNIQUE keyword for some fields
...
User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level.
2012-07-23 14:36:22 -07:00
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
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
21519070fc
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManager.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
fa414bbf0a
It's due to replace.properties is missing, by default the password is cloud for user cloud
...
Revert "removing unneeded password from cloud-dev setup-script"
This reverts commit f157b702e4
2012-07-09 11:48:43 -07:00
f157b702e4
removing unneeded password from cloud-dev setup-script
2012-07-08 22:14:20 -04:00
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
d33429783f
Fixed deploydb
2012-07-06 11:18:16 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Sheng Yang
Alena Prokharchyk
Koushik Das
Chip Childers
Kelven Yang
Mice Xia
mice xia
Nitin Mehta
Prasanna Santhanam
Rohit Yadav
Hugo Trippaers
David Nalley
Wido den Hollander
Edison Su