ef9830d6a4
Merge branch '4.5'
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
tools/appliance/build.sh
2014-12-09 14:59:36 +05:30
13205e6be1
CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes
2014-12-09 08:21:35 +01:00
016d009adf
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
The last commit 513adab51b#1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
2014-12-09 11:46:45 +05:30
05b2ec4f55
Merge branch 'hotfix/CID-1256277'
2014-12-08 12:40:08 +01:00
8f8e311110
CLOUDSTACK-8030: Updated router to come up egress default ALLOW
...
On default iptables rules are updated to add ACCEPT egress traffic.
If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
is egress default rule when there are no other egress rules.
If the CS network egress default policy is true, CS won't configure any default rule for egress because
router already came up to accept egress traffic. If there are already egress rules for network then the
egress rules get applied on VR.
For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
2014-12-08 11:32:01 +05:30
b1e4c6db07
Revert "Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.""
...
This reverts commit 24aaf19239
2014-12-08 11:20:49 +05:30
24aaf19239
Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured."
...
This reverts commit 39a671dfd8
2014-12-05 15:24:09 +05:30
2554cfb140
CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings
2014-12-05 08:42:22 +01:00
2d7f0c693b
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:55:41 +05:30
936a17be22
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:45:22 +05:30
7ef0f5507d
Attach volume events are not correctly shown in events.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 20:01:41 +05:30
fc1a09ff49
Add snapshotName parameter in CreateSnapshotCmd
2014-12-04 15:29:39 +01:00
d4605556c6
fix NPE when delete a domain
2014-12-04 15:28:41 +01:00
7b8fe0c8cd
Attach volume events are not correctly shown in events.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 19:31:03 +05:30
3c9e14e85a
CLOUDSTACK-5241: Remove Rot13 usage
2014-12-03 19:38:47 -08:00
feeafa76a4
CLOUDSTACK-5241: Remove Rot13 cipher
2014-12-03 19:30:31 -08:00
344d98e0bd
CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search.
2014-12-03 09:48:07 -08:00
8cb11f407f
CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search.
2014-12-03 09:33:22 -08:00
a81b59e2a4
Revert "some unused fields deleted"
...
This reverts commit 31db58f720
2014-12-03 18:09:49 +01:00
590667076d
CID-1256277 use StringBuffer in loop
2014-12-03 13:32:22 +01:00
c25d4fdea2
CLOUDSTACK-7847: Separate ListDomains cmd to use two different views
2014-12-03 12:33:57 +01:00
0407fb334f
CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response
2014-12-02 11:52:10 +01:00
77c88fa917
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 19:03:23 -08:00
c987080c26
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 18:59:25 -08:00
c3515c9ff9
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 18:49:09 +05:30
513adab51b
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
2014-12-01 18:09:58 +05:30
af2f21894c
CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin
2014-12-01 13:03:37 +01:00
5241d0faf8
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab
2014-12-01 16:39:01 +05:30
1e0880cbab
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 16:35:23 +05:30
e124781445
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2
2014-12-01 15:55:30 +05:30
9b907902d2
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 15:52:00 +05:30
d28b716d8a
CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers
...
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 21a6bef53b
2014-11-28 15:46:17 +05:30
21a6bef53b
CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers
...
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-28 15:43:29 +05:30
cdfdda2051
CLOUDSTACK-6075: Increase the ram size for router service offering
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488c17858f
2014-11-27 16:05:34 +05:30
488c17858f
CLOUDSTACK-6075: Increase the ram size for router service offering
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:04:59 +05:30
bf8dd828f5
CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
...
resource tags due to joining user_vm_details to user_vm_view.
2014-11-26 17:40:06 -08:00
4e7af26c9f
CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
...
resource tags due to joining user_vm_details to user_vm_view.
2014-11-26 17:23:07 -08:00
960b7bbf74
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
2014-11-26 15:08:48 -08:00
95ea203907
CLOUDSTACK-7976 : Param validation for global params involving domain name
2014-11-26 14:54:42 -08:00
86895ec13c
Add validation for domain names passed via global pamaremets
2014-11-26 14:45:50 -08:00
9585aa0b51
CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit eae733817b
2014-11-25 15:55:54 +05:30
02ca6f2e5b
CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8
2014-11-25 15:55:30 +05:30
7ff31f1b22
Merge remote-tracking branch 'origin/inetaddress'
...
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServlet.java
2014-11-25 14:32:09 +05:30
eae733817b
CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 12:22:31 +05:30
c919ff83d8
CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 11:55:43 +05:30
7175247c5e
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:30:32 -08:00
4e5b3d028d
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:27:56 -08:00
72ba98b1b8
Validate IPv4 address using Apache Commons Validator
2014-11-24 14:43:48 +01:00
87a7810ade
Fix UnitTest ApiServlet
2014-11-24 11:48:13 +01:00
d475b62838
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
2014-11-24 13:44:42 +05:30
Koushik Das
Wei Zhou
Daan Hoogland
Jayapal
Nitin Mehta
Damodar
Sheng Yang
Min Chen
Laszlo Hornyak
Daan Hoogland
Rohit Yadav
Ilia Shakitko
Harikrishna Patnala
amoghvk
Daniel Vega
Edison Su
Wido den Hollander
Sanjay Tripathi