Commit Graph

23902 Commits

Author SHA1 Message Date
Daan Hoogland e9441d4786 Updating pom.xml version numbers for release 4.4.3
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2015-04-15 17:00:24 -05:00
Remi Bergsma befa28251d CLOUDSTACK-6543 Sort domain lists in UI
As recently discussed on the dev list:
This sorts the domain lists based on their path.
Especially handy when having a lot of domains,
like in a public cloud.
2015-04-15 16:29:15 -05:00
Remi Bergsma 024a2924b7 kvm: improve CentOS 7 support
CentOS 7 does not ship with ifconfig anymore. We should use ip commands instead.
This also works on older versions, like CentOS 6 and Ubuntu 12.x/14.x, that we
support.

This closes #165

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-14 13:56:30 -05:00
Daan Hoogland 5f448c1eb5 Revert "marvin in top level pom to suit jenkins build for it"
This reverts commit 9dc45d4d04.
2015-04-13 09:24:02 -05:00
Daan Hoogland 9dc45d4d04 marvin in top level pom to suit jenkins build for it 2015-04-13 08:36:01 -05:00
Remi Bergsma 14a3d2b625 make sure sync cannot block reboot
The recent discussed improvement has the risk that if 'sync' hangs, the reboot may be delayed in the same way as the 'reboot' command would do. To work around, we're adding a 5 second timeout. If it cannot sync in 5 seconds, it will not succeed anyway and we should proceed the reset.

@snuf: Could we use your OVM3 heartbeat script for other hypervisors as well? One way to do it seems like a nice idea :-)
2015-04-10 15:10:52 -05:00
Remi Bergsma 97623bb0df write logfile just before rebooting the host
As discussed with @wido @pyr and @nuxro added an extra log line.

Tested it and it logs fine (tested to local disk) when syncing first:
Apr  3 15:31:23 mcctest2 heartbeat: kvmheartbeat.sh system because it was unable to write the heartbeat to the storage

By the way, it did also log to the agent.log but this extra log has the benefit of ending up in the system log so you'll probably find it easier there. Existing logs:
2015-04-03 15:27:23,943 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 0
2015-04-03 15:28:23,944 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 1
2015-04-03 15:29:23,946 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 2
2015-04-03 15:30:23,948 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 3
2015-04-03 15:31:23,950 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout, retry: 4
2015-04-03 15:31:23,950 WARN  [kvm.resource.KVMHAMonitor] (Thread-24:null) write heartbeat failed: timeout; reboot the host

This closes #145

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-10 14:50:58 -05:00
Remi Bergsma 6137b2681c reboot much faster in case of storage failure
When storage cannot be reached, it does not make sense to reboot as it will try to flush buffers, umount NFS mounts, etc. This will not work and thus cause a long delay. With this change, the box will reboot immediately (like pressing the reset button).
2015-04-10 14:50:15 -05:00
Sebastien Goasguen a79fd8816e Add CONTRIBUTING instructions 2015-04-03 10:20:59 +02:00
Rohit Yadav 9a730d469c CLOUDSTACK-6353: Fix list to have correct LB IP for each rule
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0fe4acf525)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-26 18:24:43 +05:30
Rohit Yadav 244c361b50 appliance: remove any stale raw.img file
This fixes a common build issue

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 17:25:11 +05:30
Rohit Yadav 33744ed658 appliance: build systemvm template for KVM compatible with older qemu
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 17:23:26 +05:30
Star Guo 611f2475c7 Fix centos63 rpm packaging
This closes #129

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 14:47:34 +05:30
Rohit Yadav af3b1f5298 centos63: fix another build regression from last merge on 4.4
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 12:47:24 +05:30
Rohit Yadav dfba731381 centos63: Fix build regression in for loop
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 12:25:15 +05:30
Rohit Yadav b4728b239c centos: fix rpm build regression from c5c5e2367e
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-25 12:04:18 +05:30
Daan Hoogland 4eae316c94 Merge branch 'feature/4.4/centos7' of https://github.com/DaanHoogland/cloudstack into 4.4 2015-03-24 10:33:57 +01:00
Daan Hoogland e7abb416d9 downgrade jasypt version 2015-03-23 21:55:51 +01:00
Daan Hoogland 54906b97d5 backported generic package script 2015-03-23 18:54:51 +01:00
Rohit Yadav dd55207c52 systemvm: fix/improve irqbalance on multicore VR
Porting changes from PR: https://github.com/apache/cloudstack/pull/119
to new codebase used for systemvmtemplate generation.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a80522acf2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-23 21:44:31 +05:30
Daan Hoogland b527aabfc3 4.4 for centos7 2015-03-23 14:22:08 +01:00
Daan Hoogland f9dce0bf23 missed code in merge of Avoid distributing private key for realhostip.com 2015-03-19 08:34:36 +01:00
Nitin Mehta c2dc53c2a1 Avoid distributing private key for realhostip.com
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/consoleproxy/AgentHookBase.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
2015-03-18 20:35:18 +01:00
Rohit Yadav e8f7215b26 ui: if session cookie exists, use it to set global session holder and invalidate it
The 19e3c0168e commit breaks SAML login and any
login where redirection is used.

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

Conflicts:
	plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
2015-03-17 13:20:46 +01:00
Rohit Yadav d3122a1b8c 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>

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2015-03-17 13:16:22 +01:00
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