tuna
2ab75245de
changes to add a docker host
2014-03-31 00:56:48 +07:00
tuna
234831a996
fix building
2014-03-29 15:26:54 +07:00
tuna
cd4444cfec
init docker
2014-03-29 15:22:23 +07:00
Hugo Trippaers
f3668453f0
Fix compile issues in mysql-ha plugin
2014-03-12 09:03:58 +01:00
John Kinsella
ec4db7bbff
CLOUDSTACK-6204: Removing realhostip.com dependency
...
For more info, see https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394399081 -0700
(cherry picked from commit 2fe7aeea23 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-10 12:55:41 -07:00
Hugo Trippaers
472a387d2d
Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag
...
(cherry picked from commit a0f932437c )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-06 16:07:32 -08:00
Alena Prokharchyk
e0e13434b9
CLOUDSTACK-5872: use List DS for storing NicProfiles as public network can have more than one nic
...
Conflicts:
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
2014-03-05 13:35:43 -08:00
Jayapal
86643d6e3f
CLOUDSTACK-6183: unplug the nic when all the ips of public vlan range is removed
...
(cherry picked from commit 7700a1b716 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:43:03 -08:00
frank
9e1525c032
CS-19377
...
[Baremetal] After deploy VM on Baremetal host, BM host fail to be PXE booted
(cherry picked from commit 793a6a7177 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:42:37 -08:00
Min Chen
ecddd70f90
CLOUDSTACK-6175:s3.singleupload.max.size option not applicable for
...
backup snapshot on KVM.
(cherry picked from commit 94257c0fc8 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:41:06 -08:00
Min Chen
d4a1adac21
CLOUDSTACK-6174: Provide separate option for Windows Server 2012 R2 as
...
an OS type when registering template.
(cherry picked from commit 4c83f80c80 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:40:49 -08:00
Likitha Shetty
3cd33f6f4a
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live VM migration of an already migrated VM (with storage) across clusters fails
...
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
Update volume path for every volume belonging to the VM to the corresponding new disk filename.
(cherry picked from commit 8cb03ddb23 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:39:44 -08:00
Likitha Shetty
e63af74f8e
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live storage migration of an already migrated volume fails
...
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
If a volume has been renamed upon migration update its volumePath to that of the new disk filename.
(cherry picked from commit c652ff45df )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:39:18 -08:00
Rajesh Battala
96118e485f
CLOUDSTACK-6159 Fixed creating volumes(Root, DataDisk) with uuid in primary store
...
(cherry picked from commit b44901c059 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:38:46 -08:00
Frank.Zhang
26002ae69c
BUG-ID: CS-19152
...
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, destroy baremetal instance fail
BUG-ID: CS-19150
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to start baremetal instance
BUG-ID: CS-19149
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, baremetal host remain in Disconnected state. But instance associated with baremetal host is running.
BUG-ID: CS-19151
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to reboot baremetal instance
BUG-ID: CS-19156
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to stop baremetal instance
reviewed-by: edison
(cherry picked from commit 3787579d29 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-03-04 23:36:17 -08:00
Hugo Trippaers
9d6ba8e406
Addon on Davids fix. Fix runtime dependency in awsapi/pom.xml. Set dependency for mysql in juniper contrail to test, as it is only required for integration testing.
2014-02-24 10:08:01 +01:00
Daan Hoogland
307ad15bb6
check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
...
6d0dbf5968 )
Conflicts:
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
(cherry picked from commit d38a503431 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-18 14:12:50 -08:00
Santhosh Edukulla
c1af92fcbb
Added Fix for CLOUDSTACK-5875
...
Added fix for exception and listing. Mentioned details under bug.
Post the fix, simulator works fine.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit d31fa09c7e )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:48:18 -08:00
Harikrishna Patnala
01289b1647
CLOUDSTACK-6023: Non windows instances are created on XenServer with a vcpu-max above supported xenserver limits
...
Changed the VCPU max limit to 16 and provided a cluster level configuration parameter for this max limit named xen.vm.vcpu.max
(cherry picked from commit 95e41fdf0d )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:32:01 -08:00
Devdeep Singh
9536569e1f
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
...
(cherry picked from commit 96d8e3c945 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:21:18 -08:00
Rajesh Battala
3c891fcf66
Fixed agent code to handle untagged public vlan while parsing the vlan id
...
(cherry picked from commit 7df148c762 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:17:16 -08:00
Murali Reddy
f93be7b2b6
CLOUDSTACK-5967: GRE tunnel creation is failing
...
after network orchestrator refactor, only network elements providingg
services as defined by network offering, are invloved network design and
imlement phase. So OVS network element need to be enables as
'Connectivity' service provider to make GRE tunnels work. This fix
introduced 'Ovs' provider as Connectivity service provider.
(cherry picked from commit 2e004878b1 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:52 -08:00
Hiroaki KAWAI
f5b9fedb11
stratosphere-ssp plugin: Fix HttpClient4 connection leak
...
Replaced HttpClient#execute(HttpUriRequest) with
HttpClient#execute(HttpUriRequest,ResponseHandler<T>).
The former requires extra EntityUtils#consume(HttpEntity).
(cherry picked from commit 09e27fd7bf )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:16:31 -08:00
Min Chen
85091e9b6b
CLOUDSTACK-6027:CreateVolume from snapshot is failing with S3 on Vmware.
...
(cherry picked from commit d7ec9ca815 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:45 -08:00
Min Chen
a439ec9b62
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.(cherry picked from commit a3caea7e0a )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:15:18 -08:00
Min Chen
0d72e2ccf5
CLOUDSTACK-6019:CreateVolume from snapshot in NFS is throwing Warning
...
"sync snapshot from cache to region wide store failed for image store
test".
(cherry picked from commit b11c13d4a1 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:14:55 -08:00
edison
bd335d01cb
fix devcloud reboot issue: should not start heartbeat for devcloud
2014-02-06 14:19:29 -08:00
Likitha Shetty
5480a810a6
CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found.
...
(cherry picked from commit ba5b302ae6 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:08:56 -08:00
Hiroaki KAWAI
9961a8e710
Some rework stratosphere ssp plugin
...
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
(cherry picked from commit db3dc2ee17 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:03:11 -08:00
Daan Hoogland
a42a345684
findbugs replaced byte[].toString() with new String(byte[])
2014-02-02 19:50:58 +01:00
Daan Hoogland
438a4b0d5a
Revert "findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)"
...
This reverts commit 55ec8f3a2d .
2014-02-02 19:38:49 +01:00
Likitha Shetty
e089b91385
CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade.
...
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
(cherry picked from commit 16c3f53793 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:59:37 -08:00
Daan Hoogland
55ec8f3a2d
findbugs replaced byte[].toString() with Arrays.toString(byte[])(cherry picked from commit ce7c6d2357)
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:57:50 -08:00
Animesh Chaturvedi
602faecafe
Revertng based on mail thread discussion "Fix findbug issues within LDAP authenticator"
...
This reverts commit 92b4f66d73 .
2014-01-30 17:55:39 -08:00
Ian Duffy
9776e1af1c
Fix findbug issues within LDAP authenticator
2014-01-29 21:31:12 +01:00
Marcus Sorensen
7ca27f6cc6
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
...
(cherry picked from commit e624632dfd )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:58:57 -08:00
Hugo Trippaers
220a2a1a0e
Backport fixed for issues found by Findbugs
...
(cherry picked from commit 60ac12780b )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:14:44 -08:00
Hugo Trippaers
1be40d6926
Findbugs finding : Incorrect use of equality
...
(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
(cherry picked from commit f18c5a1910 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:12:10 -08:00
Jayapal
63e839c0f8
CLOUDSTACK-5966 Added enable/disable monitoring service in global config
...
(cherry picked from commit 782265e713 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:31:37 -08:00
Likitha Shetty
d4a3f7be81
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
...
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
(cherry picked from commit e8ba2d0850 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:23:34 -08:00
Devdeep Singh
ce1b393f73
CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
...
password from the message string before writing to the log. Made a change to do so.
(cherry picked from commit 6d997bd689 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-27 19:54:01 -08:00
Anthony Xu
43d485c92d
Revert "CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled."
...
This reverts commit af5f3d5676 .
2014-01-22 15:07:47 -08:00
Alena Prokharchyk
aa6f4dc8a7
CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit f160b31f51 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-22 13:07:43 -08:00
Likitha Shetty
c14941edf8
CLOUDSTACK-5927. Storage garbage collector is trying to destroy the SSVM/CPVM root disk that is in use.
...
In case of VMware VM during root volume preparation if we are switching to a new volume, force expunge root disk that was created from the old template.
Because otherwise storage garbage collector will later try to expunge the old disk marked for expunge and fail with 'Cannot delete file' exception
since in VMware the new root vmdk has the same name and is now in use.
(cherry picked from commit 94ea2736f4 )
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-22 13:05:46 -08:00
Alena Prokharchyk
d5e0dcd2a7
Revert "Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased"
...
This reverts commit 7884bb8aaf .
2014-01-21 19:50:46 -08:00
Alena Prokharchyk
7884bb8aaf
Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
2014-01-21 18:09:15 -08:00
Anthony Xu
af5f3d5676
CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled.
2014-01-21 17:55:56 -08:00
Animesh Chaturvedi
70ba92fc14
Updating pom.xml version numbers for release 4.3.0
...
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
Hugo Trippaers
7c4831df92
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select switch name, type and vlan token. Change preference to use the tags set on the physical network.
2014-01-21 08:18:21 +01:00
Mike Tutkowski
413c61b519
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:08:27 -07:00