etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,877 Commits 322 Branches 325 Tags 974 MiB
Commit Graph

23877 Commits

Author SHA1 Message Date
Jessica Wang 0b68bf2ead CS-18149: UI - no longer store sessionKey in cookie. After 
... this change, opening the 2nd browser window (of the same
domain) will show login screen (i.e. user has to enter
credentials again) and will cause the 1st browser window
session timeout.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/cloudStack.js
 2015-03-17 12:58:21 +01:00
Rohit Yadav 8e58bc0879 ElastistorUtil: remove unused imports 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 16:06:26 +05:30
Bharat Kumar 75c17a31e7 CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm. 
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 659edb4d9b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:52:40 +05:30
Rohit Yadav b1f54db18f utils: use a better extended implementation of SSLSocketFactory 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4a5a32a74)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
 2015-03-16 15:52:38 +05:30
Jayapal 0f10d3690b Avoid logging password when adding srx device 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 32fe64ce1b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:51:28 +05:30
Harikrishna Patnala f68b407283 CS-17504: Weak SSL ciphers supported by the management server 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f947fad197)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
 2015-03-16 15:50:26 +05:30
Min Chen 84c6cc361b CS-19734:Session cookie is exposed to scripts. 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0b5b9c91e4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:49:33 +05:30
Prachi Damle 6da3d1bd6b CS-20680: The user's secret key is not encrypted in the UserCredentialsVO class 
Changes:
-Added annotation to encrypt the secret key while persisting to the DB

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c5754e693f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:49:27 +05:30
Min Chen c698af221b Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to. 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0d36f2e4b5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:49:21 +05:30
Brian Federle 2497a7a64d Fix encoding for user account label in header 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit bfcdbeca29)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-16 15:49:15 +05:30
Harikrishna Patnala a3069ac02a CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false 
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
 2015-03-12 14:54:02 +01:00
Rohit Yadav 258058772e server: remove unused import in ImageStoreJoinDaoImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-11 17:25:37 +05:30
Rohit Yadav c620a0640a api: avoid sending sensitive data in api response 
- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 02cadc3fb3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2015-03-11 16:35:55 +05:30
Rohit Yadav eed3db8851 systemvm: avoid tcp responses with timestamp 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f3f47f25ba)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 17:13:52 +05:30
Rohit Yadav c4c783727d CLOUDSTACK-7639: make cidr updation more efficient 
check and update only when required

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b879916f5c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 16:30:29 +05:30
Rohit Yadav bba292f24d CLOUDSTACK-7639: make cidrlist update when updateNetworkAclItem is called 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b2b9de7fa3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-09 16:30:26 +05:30
Rohit Yadav 9ea3bd23ec CLOUDSTACK-8248: loadCidrs before sending response 
Fixes regression from CLOUDSTACK-6582

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f9090eacd6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-06 21:44:08 +05:30
René Moser 936d883823 CreatePortForwardingRuleCmd: Fix typos and update descriptions. 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2015-03-05 11:00:14 +01:00
Sebastien Goasguen 212b34f08b Fix Marvin version in Dockerfile 2015-03-04 12:51:36 +01:00
Sebastien Goasguen 2504ea499d exclude Dockerfile and supervisord.conf from RAT 2015-03-04 12:37:52 +01:00
Sebastien Goasguen a411015726 Add Dockerfile for simulator 2015-03-04 11:58:13 +01:00
Bharat Kumar 10bb8af343 CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check 2015-02-26 17:30:27 +01:00
Rohit Yadav 72d78e57c8 CLOUDSTACK-7089: don't log VNC password 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 18:11:28 +05:30
Rohit Yadav 14a00679bd CLOUDSTACK-8285: check and update IP capacity states based on allocation state 
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 985a61652e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
 2015-02-25 16:48:54 +05:30
Rohit Yadav 0208de721e CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b462a56f27)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
 2015-02-25 14:31:57 +05:30
Rohit Yadav d4361b96d0 db: use explicit USE statements to avoid SQL failures 
create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

(cherry picked from commit 09e26c826f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-23 02:02:47 +05:30
Rohit Yadav 34cefb17aa CLOUDSTACK-6541: Fix monthly recurring snapshot UI limit, limit to 1-28 days 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 070813a106)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-19 15:43:05 +05:30
Rohit Yadav 7341de39b9 CLOUDSTACK-5824: poll for delete snapshot and volume events 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a85aea74de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-19 15:34:33 +05:30
Marcus Sorensen fe5d41d8c3 CLOUDSTACK-8263: KVM - virsh resize doesnt refresh libvirt's view of the volume size, refresh pool 
Change-Id: I5ea54f7389d72b57bb625e4d87b45b65eb0c96cd
 2015-02-18 12:55:37 -08:00
Rohit Yadav 65172e3b9e Merge remote-tracking branch 'exoscale/usage-event-missing-for-os-stopped-instance' into 4.4 
This closes #80
 2015-02-18 11:14:25 +05:30
Marcus Sorensen fbb637791c CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient 
Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6
 2015-02-17 18:10:27 -08:00
Marcus Sorensen f0893d5794 CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage 
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
 2015-02-17 17:23:18 -08:00
Pierre-Yves Ritschard 0ba75bcebd ensure agent reconciliation triggers events 2015-02-17 16:33:57 +01:00
Rohit Yadav a8273c0a94 CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e5cd75790a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-16 15:32:12 +05:30
Daan Hoogland fbafc957dc CLOUDSTACK-8238 handling of retry ping improved 2015-02-10 14:36:55 +01:00
Erik Weber 0c0c7dd070 Add absolute schema references to support MySQL 5.6 better 
(and MySQL 5.5)
 2015-02-08 16:55:39 +00:00
Rohit Yadav c19ec86c17 cloud-early-config: load-modules 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-06 15:33:24 +05:30
Jayapal f7a4d145a6 CLOUDSTACK-5494: Fixed dns is open to public in VR 
(cherry picked from commit 81994cf443)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	systemvm/patches/debian/config/etc/init.d/cloud-early-config
 2015-02-06 15:32:14 +05:30
Rohit Yadav c3d6996771 improve protocol enabling based on socket object type 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d62d511f47)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 15:49:14 +05:30
Anthony Xu df92a45b05 fixed NPE 
This closes #70

(cherry picked from commit 98b416b7f0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-05 12:12:59 +05:30
Rohit Yadav 422235c667 CLOUDSTACK-8198: Use random local storage UUID 
Earlier host addition of multiple hosts with local storage failed due to
same local storage UUID being used where the storage path is same.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit bf17f640c6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-03 22:37:57 +05:30
Rohit Yadav 2a74548093 use a preferable protocol that works on jvm 1.6 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java
 2015-01-29 16:00:50 +05:30
Rohit Yadav f1cccf6fec appliance: hold on to openswan version, don't upgrade 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a10a9d522c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-28 23:22:33 +05:30
Rohit Yadav 15dd76c4c7 appliance: fix missing statement 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a3fa59eaf1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-28 23:14:36 +05:30
Rohit Yadav 44b4f3d8ee appliance: upgrade systemvm to latest packages 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit eca528dec7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-28 23:13:22 +05:30
Rohit Yadav 4752c1e6af appliance: use latest debian 7.8 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 61563d71ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	tools/appliance/build.sh
 2015-01-28 18:11:28 +05:30
Daan Hoogland 1f209ff226 CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:59:40 +01:00
Marcus Sorensen 84a14f681f Introduced a typo in the license somehow on the last commit 2015-01-23 00:35:39 -08:00
Marcus Sorensen e2bb4cf583 LibvirtComputingResource: Expose KVMStoragePoolManager 
KVMStoragePoolManager is a singleton in practice, any plugin
or extension of LibvirtComputingResource will need to act on
the specific instance of KVMStoragePoolManager that LibvirtComputingResource
has initialized. Therefore, expose this variable for those who
wish to call storage commands from plugins or extensions.

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2015-01-23 00:13:19 -08:00
Rohit Yadav c8b890bece services, awsapi: use better string comparision 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-22 18:11:39 +05:30