New network.bridge.type was introduced, but for
buckward compatibility, the key should be optional.
Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
This are symlinks to server-nonssl.xml and tomcat6-nonssl.conf, but
they are required for starting the management server.
Commit 2db7a4559e broke this.
Ovs brcompat will be obsolete, so if network.bridge.type was
set to openvswitch, we'll use ovs command explicitly.
Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
Japanese properties file was broken, fixed manually.
We need to let the servlet container the encoding to use.
Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
Detail: Undefine VM after migration. Lingering domain definitions cause
migrations back to the original host to fail, since domain already exists.
BUG-ID: CLOUDSTACK-2640
Bugfix-for: 4.1.0,4.2.0
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1369285950 -0600
Patch for 4.1, changes:
- In VolumeReservationVO, the getter method of a column had a typo, causing us to create a wrong searchbuilder. It was searching over the 'id' column instead of 'vm_reservation_id' causing
- This bug was causing the vm deployment to choose a wrong pool during deployment since the search was choosing incorrectly
- This bug in the GenericSearchBuilder is also fixed - if the getter method does not use the standard 'get' or 'is' prefix, one should annotate that method using
@Column(name = "<column_name>") and indicate which column this method refers to. This will cause the GenericSearchBuilder to identify the field correctly.
- Also, let planner search for pools instead of selecting the one reserved - because there is no way currently to pass multiple pool information to the planner and this may cause issues when a VM has multiple disks.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
platform
Use the Gson adapters to serialize/deserialize the NatRules
Switch the NiciraNvpApi to a single gson Object with the proper adapters
Fix missing order setting for static nat rules and portforwarding rules
Return an error when a port range is passed in a portforwarding rule
The serializer is not required
Fix a bug where an ip address could be released even if it was still in
use for SourceNat
Throw a json parse exception when the type is unknown to the adapter
Missing default constructor fails the agent manager reloading the XCP
resource on reboot of management server. This is fixed by using the
default constructor as do other Xen resources and include a new resource
ala XenServers for XCP1.6.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 806aeb990d)
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
The debian package cloudstack-awsapi is being built empty. This patch
adds the required files to the package and a symlink for webapps/awsapi so the awsapi can
be found by tomcat, without change in configuration.
Chip Childers
Kishan Kavala
Milamber
Hiroaki KAWAI
Wido den Hollander
Chip Childers
Hugo Trippaers
Min Chen
Murali Reddy
Marcus Sorensen
Prachi Damle
Anthony Xu
Hugo Trippaers
Wido den Hollander
Prasanna Santhanam
Emerson Pinter
Wei Zhou
Chiradeep Vittal
Brian Federle
Gavin Lee