Commit Graph

107 Commits

Author SHA1 Message Date
Rohit Yadav 88acc9bd53 systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE­2014­3566)
Just prefer TLS over SSL in apache configuration in systemvm

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 01:43:55 +05:30
Sheng Yang 03a43159d8 CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC
OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.

Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through.
2014-10-30 17:23:34 -07:00
Edison Su 9d5b7b73a2 MTU should be put on storage network: eth3, instead of eth1 Reviewed-by: Frank 2014-10-30 02:45:46 -07:00
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Daan Hoogland 1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
Saksham Srivastava b29d075108 CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation policies on SSVM and CPVM
(cherry picked from commit 3e02bfa74f)
2014-10-13 00:13:25 -04:00
Sanjay Tripathi d97ad972b4 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware.
(cherry picked from commit bdf7d65305)
2014-10-13 00:06:13 -04:00
Saksham Srivastava cd3df842f2 CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not anymore support reload option on debian wheezy
(cherry picked from commit 3a8c450890)
2014-10-12 23:55:42 -04:00
David Nalley ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
Frank Zhang 6dd3a91864 CLOUDSTACK-6278
Baremetal Advanced Networking support

 fix baremetal-vr.py license header
2014-10-06 16:07:51 -07:00
Frank Zhang 01dada100a CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-10-06 16:03:19 -07:00
Saksham Srivastava 3e02bfa74f CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation policies on SSVM and CPVM 2014-10-01 13:39:09 +05:30
Sanjay Tripathi bdf7d65305 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware. 2014-09-29 11:54:57 +05:30
Saksham Srivastava 3a8c450890 CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog does not anymore support reload option on debian wheezy 2014-09-25 15:59:08 +05:30
Frank Zhang 3e6817c878 CLOUDSTACK-6278
Baremetal Advanced Networking support

    add missing license header to systemvm/patches/debian/config/etc/rc.local
2014-09-22 14:44:14 -07:00
Frank Zhang 6155d3ecaa CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-22 13:57:32 -07:00
Frank Zhang 8b89494a35 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Daan Hoogland dec9133dcd CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval
(cherry picked from commit 4d065b9a3a)

Conflicts:
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/resource/DiscovererBase.java
2014-09-18 12:51:10 +02:00
Bharat Kumar 29911dd2e1 CLOUDSTACK-7376 passwd_server attempts to start but terminates with the exit code 137
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-09-17 09:28:44 -07:00
Sanjay Tripathi 4796cceb34 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware.
Fixed the jp keyboard issues for VMs deployed with keyboard=jp param.
2014-09-15 16:16:45 +05:30
Jayapal 3cb6d4a4df CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc 2014-09-15 14:54:13 +05:30
Jayapal b4f03a1339 CLOUDSTACK-7517: loading ftp modules in VR 2014-09-10 14:10:14 +05:30
Fred Clift 355eb72c7d make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-04 04:22:27 -04:00
Wido den Hollander 1499972804 CLOUDSTACK-7405: Make the trailing slash conditional for meta-data requests
This should fix the cloud-init issues described in this issue.
2014-08-25 14:13:09 +02:00
Sanjay Tripathi 1354605073 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware host.
This fix is to correct the JP keyboard mapping for VMs with windows and centOS GUI
and CLI OS on VMware hypervisor. Also fixed some known issues on centOS CLI on XS
hypervisor. Fix is not causing any regression.
2014-08-20 14:34:28 +05:30
Joris van Lieshout c90bf1231f sysctl improvements. 1. ip_nonlocal_bind for smooth transition in case of a keepalived failover. 2. panic settings so that a vm dies in a way that ACS understands it's down. 3. also up the nf_conntrack limits.
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 45deade1df)

Conflicts:
	systemvm/patches/debian/config/etc/sysctl.conf

(cherry picked from commit c4d1bf7f24)
2014-08-14 14:11:33 +02:00
Sheng Yang 2ff7b846fd CLOUDSTACK-7185: Change Apache2 log rotation policy to avoid memory leak 2014-07-25 14:02:44 -07:00
Hugo Trippaers 1ad1883b74 Add virtualbox support to cloud-early-config so we can use virtualbox for testing 2014-07-14 15:34:14 +02:00
Jayapal e0d4af5062 CLOUDSTACK-7092: Disabled icmp redirects in VR 2014-07-10 15:17:50 +05:30
Jayapal 2f1b40d2e8 CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over 2014-07-01 15:16:27 +05:30
Jayapal d5e686f2ec CLOUDSTACK-6997: Increase proc ip_conntrack_max 2014-07-01 10:29:46 +05:30
Sheng Yang 563934c989 CLOUDSTACK-3540: Fix edithosts.sh on matching tag 2014-06-27 17:18:38 -07:00
Sheng Yang 75c9a20c77 CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection
Sometime in VR ntpd would move time backward to keep sync with NTP server, which
can result in false alarm of keepalived monitering process.

This patch adds 3 strikes for keepalived process dead detection to avoid falsely
shutdown keepalived process due to time adjustment for only once.
2014-06-24 17:04:58 -07:00
Sheng Yang c181485ae5 CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary
This new way would only enable IPv6 when VR is created in IPv6 shared network.
Otherwise IPv6 sysctl options remain disable.
2014-06-13 11:08:32 -07:00
Joris van Lieshout 66816827cb Cosmetic fixed. three in total. 1. Only run hv_kvp_daemon if it exists. 2. add the -f argument to the rm to make is silent if it doesn't exist. 3. by using log_action_msg instead of log_action_begin_msg the screen output looks way better.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-12 14:56:11 +02:00
Daan Hoogland b85dd956f8 rats 2014-06-10 16:21:06 +02:00
Joris van Lieshout 2e83baaca2 xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so these commands file. It does have xenstore-write and xenstore-rm so by adding a - this is fixed easily.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-10 16:06:58 +02:00
Joris van Lieshout c54ce3cafb If for some reason dnsmasq.log does not exist anymore logrotate will create it with nobody as owner. This will prevent dnsmasq deamon from logging to that file.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-10 15:51:03 +02:00
Joris van Lieshout 11f532bbec blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not working because the include only works if the file ends with .conf.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-10 15:45:15 +02:00
Jayapal d093a8a7b4 CLOUDSTACK-6328: added license header and removed white space 2014-05-27 15:56:47 +05:30
Saurav Lahiri 96b1c6bf3c CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
Signed-off-by: Jayapal <jayapal@apache.org>
2014-05-27 15:56:25 +05:30
Joris van Lieshout 2b325afb45 A slightly more reliable way of extracting the device name. Thanks John.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-20 12:29:41 +02:00
Jayapal 6052a181dd CLOUDSTACK-6714: monitor script echo service command is added with quotes 2014-05-20 14:11:19 +05:30
Joris van Lieshout 2ebeec4334 releasing dhcp leases on vpcs failes because the network tier of the tennant aren't behinbd eth0. Here we make interface selection dynamic.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-14 16:11:03 +02:00
Jayapal d4f167032b Fixed vpc private gateway backend issues 2014-05-07 16:33:46 +05:30
Nitin Mehta 1d45b75298 CLOUDSTACK-6499:
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
2014-04-24 17:27:02 -07:00
Saurav Lahiri 42d48fe9ab cloudstack-6258: Log file will be set to cloud.out only if CLOUD_DEBUG is enabled 2014-04-25 05:50:57 +05:30
Sanjay Tripathi d1658c4282 CLOUDSTACK-6494: Typing a pipe '|' character in VM console returns a question mark and pipe '?|'. 2014-04-24 13:28:30 +05:30
Sheng Yang 74fe010db3 CLOUDSTACK-6434: Make RvR advert_int configurable
In some network environment, 1*3 seconds by default make RvR setup too
sensitive. A configurable parameter would be better for fitting different
network environments.
2014-04-16 20:13:16 -07:00