725c040d5c
Added code to configure netusage for vpc and domR devices
...
Removed code from existing scripts that does the same
Fixed some more issues with CsNetfilter
Added rsync for/etc/iptables in rsync
2015-03-16 11:35:27 +01:00
3cdaa55462
icmp-type parameter was being skipped
2015-03-16 11:35:27 +01:00
2765a506dc
Moved databag into a separate file
2015-03-16 11:35:26 +01:00
733bc19eac
Include base rule sets in Acls
...
Also made some adjustments to the base rule sets to ensure my parsing routine works
2015-03-16 11:35:26 +01:00
a7338387c1
Sourcenat is handled differently for routers and vpc routers
2015-03-16 11:35:26 +01:00
576564e744
If a file doesn't exist, create it
2015-03-16 11:35:26 +01:00
762e05ddee
Bug fixed:
...
Default drop rul for inbound chain gets dropped by CsNetFilter
This would have been bad (tm)
2015-03-16 11:35:25 +01:00
8b38bff962
A lot of corner cases dealt with
...
Need now to expand the test data to ensure I have got them all
Also failure to match because bizarrely some strings were unicode and some not
2015-03-16 11:35:25 +01:00
5137d7e136
Removed dhcpopts.conf for now as, it is the routing options and they seem to be dealt with dofferently in the new arrangement
...
Changed the dhcp tests to avoid handing out the broadcast and gateway addresses :)
2015-03-16 11:35:25 +01:00
f21b90a73e
Add missing sourcenat rule
2015-03-16 11:35:25 +01:00
6d12d94e0c
Add the public source nat rule
2015-03-16 11:35:24 +01:00
80a149abb7
Add port forwarding and static nat to the convergence infrastructure
2015-03-16 11:35:24 +01:00
8c5dba31d0
Fix the forwardingrule databag
2015-03-16 11:35:24 +01:00
7fc3365459
Implemented delete (add : false) for cs_dhcp
...
Added some tests to the test_update_config tests for dhcp entries
2015-03-16 11:35:24 +01:00
e6e47de6ff
Stupid stupd bug
...
a or b is of course not the same as a | b
2015-03-16 11:35:23 +01:00
c318bd6337
Corrected bug (I love tests)
...
The dhcp server will only start listening after a host has been added
In this condition, HUP is not enough
Changed so that if it is adding a first host it will restart the server
2015-03-16 11:35:23 +01:00
0e8c79c7f1
That is the acls.
...
Need to check the order stays good
2015-03-16 11:35:23 +01:00
f273fd4659
Add the static nat rules to the merge procedure
2015-03-16 11:35:23 +01:00
a789e8bf57
Fix a bug that would add updated control ip address instead of replace
2015-03-16 11:35:22 +01:00
8f4461567d
That should be all the dhcp settings correct
...
CsGuestNetwork moved out of configure
dnsmasq config all switched to CsDhcp
2015-03-16 11:35:22 +01:00
b45c71ee31
Acl code linked in
...
Dhcp code
Test file for dhcp entry
2015-03-16 11:35:22 +01:00
683e660d60
Small (but important) fixes
2015-03-16 11:35:22 +01:00
574fa2c0a0
Call update_config.py if it is there
2015-03-16 11:35:21 +01:00
8abf1a22ab
Auto create missing chains
...
Auto delete superfluous rules
TO DO: Priorities
2015-03-16 11:35:21 +01:00
19fd0b4b57
Added logic to create all necessary firewall rules
...
TODO: Auto add chains
TODO: Delete rules that should not be there
TODO: Deal with precidence
2015-03-16 11:35:21 +01:00
cd0ad69281
Tidied up main to be in line with the newer classes
...
Added a base classs CsDataBag which will autoload a given databag
2015-03-16 11:35:21 +01:00
c6d99a45a2
First part of some serious refactoring
...
The problem is that teh convergence model does not works as it currently is
Firewall rules will get added but not deleted
This builds a table of firewall rules that need to be present
The new CsNetfilter class will then do:
1. Add rules that are not present
2. Delete any that were not explicitly in the add list
WIP
2015-03-16 11:35:21 +01:00
e323d63867
Merge vmmetadata, reuse the code from the existing script to parse it.
2015-03-16 11:35:20 +01:00
4527519081
Refactored CsHelper into a module
...
Introduced CsNetfilter module/class
2015-03-16 11:35:20 +01:00
4e63119873
Moved processing the cmd_line databag into update
2015-03-16 11:35:20 +01:00
3ea63ced68
Added merge for network_acl type message
2015-03-16 11:35:19 +01:00
fff3964332
Add catchall for unknown types
2015-03-16 11:35:19 +01:00
9ede758e4d
Small update to try do deal with the stuck issue
2015-03-16 11:35:19 +01:00
98a43d184b
Fixed bug in which every run of loadQueueFile would append to the json file (merge)
...
cloud-early-config now saves its input file to /var/cache/cloud
Execute load cmd_line.json in update_config
Old way of working still in there to stop and possible clash until the base image is made
2015-03-16 11:35:19 +01:00
680454dfdf
Some bug fixes
...
Some more tests
store vmpassword functionally working
Tests for store password
2015-03-16 11:35:18 +01:00
9d73879061
Fixed test (assert in guest check was wrong way around)
...
Also found condition inw hich apache would be miscobfigured and failed to run (I love tests!!)
Fixed configure.py to cover this case
Added a test to provoke this case!
2015-03-16 11:35:18 +01:00
4c5f4a1f9f
Added vmpassword type (does nothing yet)
...
Fixed tests to use /var/cache/cloud
Added some test files but will remove them when tests are properly completed
Fixed a bug in configure that did not deal well with databags with empty dev sections
2015-03-16 11:35:17 +01:00
6a016d5b54
Small fixes
2015-03-16 11:35:17 +01:00
85434f49b9
Hotfix for lost control interface
2015-03-16 11:35:17 +01:00
58919dcf50
Change the location for the temporary json files to /var/cache/cloud
2015-03-16 11:35:16 +01:00
ca2ff2946e
Added some tests that test stuff
...
Specifically checking whether certain ip addresses get added and deleted
Also a rudementary test for the guest network ip
Much more to do!!
2015-03-16 11:35:16 +01:00
c428d60e6b
Stop ignoring eth0
2015-03-16 11:35:15 +01:00
dd6b643ceb
Do not use eth0 or eth1 for random tests
...
One or other will be the control interface of the box
2015-03-16 11:35:15 +01:00
cc5d72133e
Removed chef as we will definitely not go this way
2015-03-16 11:35:14 +01:00
6a7a832ef5
iDo not do the post configure steps on a control interface
2015-03-16 11:35:14 +01:00
2aed586bfc
Removed merge_cline - no longer required
...
Added the last pieces of vpc guest network
password server and associated FW rules
Added apache2 config and start of server
Corrected a bug in CsFile
Fixed some of the many pyLint bleats
2015-03-16 11:35:13 +01:00
295e2caff0
Fix configure::waitForDevice when a device is missing.
...
Was using non-existing 'ip' variable.
2015-03-16 11:35:12 +01:00
cf4cdde291
Fix update_config.py use of subprocess.
2015-03-16 11:35:12 +01:00
6244265de0
Fancy line editor for Ian
2015-03-16 11:35:11 +01:00
05702ecd1a
Added guest network configuration
...
Added iptables config (adds but no deletes yet)
Apache config (VPC GN)
DNSMasq config (VPX GN)
2015-03-16 11:35:10 +01:00
666dc16e58
Moved bag location to /et/cloudstack
...
Updated test script to also process command line
Added connmark stuff to merge
2015-03-16 11:35:09 +01:00
2a94ca69ce
Added some lost lines back using Hugo witchcraft
2015-03-16 11:35:09 +01:00
ca4887d9cc
Test data for ipassociation
...
These files emulate commands coming from cloudstack itself
2015-03-16 11:35:08 +01:00
c7c1f3202e
Plan B
...
Replace chef with a python script
configure.py will read the bags and (hopefully) create the desired state
At this stage this is ipassociation
This code should work for both VR and VPCrs
TODO:
iptables
ip route throw (present in VR but not in VPCr
Determine default route
Unit tests
2015-03-16 11:35:08 +01:00
3811b8dc90
Split Databag in to separate class as I would now need this
2015-03-16 11:35:06 +01:00
3077eb925b
Include the guestnetwork code
...
This takes the guestnetwork object and also creates an ip object
2015-03-16 11:35:06 +01:00
9355dd7133
Corrected a hole in my logic
2015-03-16 11:35:05 +01:00
0bf7d54722
1. Completed provider for ip rules (fwmark)
...
2. Added merge routine for guestnetwork config messages
3. Updated test script
2015-03-16 11:35:05 +01:00
583f177619
Disable cmdline check until it's fixed
2015-03-16 11:35:04 +01:00
0027db6cd1
Switch ip associations to new model and update the recipes
2015-03-16 11:35:04 +01:00
0db157e58f
Remove debug code
2015-03-16 11:35:04 +01:00
d868b0521b
Correct small typo in error message
2015-03-16 11:35:03 +01:00
bcb760e1e2
Can now read the ips out of the cmdline databag (if present)
2015-03-16 11:35:03 +01:00
0c8f8d945e
Only ip_association files for now
2015-03-16 11:35:03 +01:00
bcbefb2833
Changed from camelCase to json_case
2015-03-16 11:35:03 +01:00
54b21220db
Use json naming standards instead of camelCase
2015-03-16 11:35:02 +01:00
018b56385c
Added cs_ip module
...
Corrected syntax error in merge.py
2015-03-16 11:35:02 +01:00
a357e12943
Add the Python bits
2015-03-16 11:35:02 +01:00
72111c3399
Merged cookbooks from vpc branch
2015-03-16 11:35:01 +01:00
b596be1a82
Add a placeholder for the trigger file
2015-03-16 11:35:00 +01:00
7afd50d65a
This file isn't used, so remove it
2015-03-16 11:34:59 +01:00
5b82e2059d
Cherry-pick of 11c00977f77f45aa7b0c387dc88360eba0819e8a:
...
----
Author: Ian Southam <isoutham@schubergphilis.com>
First commit towards moving systemvm to chef based configuration
In this commit
1. cmdline json databag is created
2. ip association data bag is created
3. Basic chef cookbook to manage ips and routes
Conflicts:
systemvm/patches/debian/config/etc/init.d/cloud-early-config
systemvm/patches/debian/config/var/chef/cookbooks/README
tools/appliance/definitions/systemvm64template/postinstall.sh
----
Because we've refactored the systemvm template the change to
postinstall.sh now gets its own chef.sh file.
2015-03-16 11:34:59 +01:00
375e998eaf
CLOUDSTACK-8272: Python based file-lock free password server implementation
...
- VRs are single CPU, so Threading based implementation favoured than Forking based
- Implements a Python based password server that does not use file based locks
- Saving password mechanism is provided by using secure token only to VR (localhost)
- Old serve_password implementation is removed
- Runs with Python 2.6+ with no external dependencies
- Locks used within threads for extra safety
This closes #106
(cherry picked from commit 4b45d25152
2015-03-12 13:57:49 +05:30
47de4a12f4
systemvm: correct sftp subsystem path of debian wheezy
...
This closes #104
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-10 10:15:05 +05:30
37b4d9c308
systemvm: use Debian http redirector for apt repositories
...
* No offline mirrors
* No out of date mirrors
* New mirrors are used
* Load-balancing
* Faster downloads (when APT is used, via parallel downloads)
* Great on mobility
Also see http://http.debian.net/ for more information.
This closes #103
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-10 10:11:08 +05:30
ebcad34d33
systemvm: avoid tcp responses with timestamp
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f3f47f25ba
2015-03-09 17:12:22 +05:30
5256b0205a
systemvm: have apache2 use secure SSL cipher suite
...
Created using Mozilla's ssl config generator:
https://mozilla.github.io/server-side-tls/ssl-config-generator/
Intermediate setting was used, with apache version 2.2.22 and openssl 1.0.1e
Oldest compatible clients:
Firefox 1, Chrome 1, IE 7, Opera 5, Safari 1, Windows XP IE8, Android 2.3, Java 7
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit ab8f367850
2015-03-09 12:45:06 +05:30
da1d8f9dce
volume upload: fixed the UI after the change to move params to header.
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2015-02-27 17:40:06 +05:30
bc997f1acb
volume upload: escape $1 in the rewrite rule
2015-02-17 11:34:18 +05:30
8414223a96
CLOUDSTACK-5494: Fixed dns is open to public in VR
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 81994cf443
2015-02-06 15:31:13 +05:30
e08522dbaa
volume upload: adding the rewrite rules on start of cloud service
2015-01-29 16:55:30 +05:30
664186f483
CLOUDSTACK-8160: use preferable protocols
...
(cherry picked from commit debfcdef78
2015-01-21 18:04:45 +05:30
ebaa4dd38e
volume upload: added httpcomponents server and removed nio server
...
removing nio server as it is currently handling only https connections
and the parsing logic is also specific to agent communication.
current limitation of httpcomponents server is that the entire file is
read in memory. need figure out how to read it in chunks and send it
through a inputstreamreader to save on secondary storage.
2015-01-16 17:15:14 +05:30
631e6e0088
volume upload: doing https redirect as NioServer handles only https
2015-01-13 10:43:21 +05:30
2c169bc02d
volume-upload added a upload url redirect in apache conf
...
rewrite engine is on only in the case fo SSVM
2015-01-09 09:16:00 +05:30
aae393dcd5
CLOUDSTACK-7974: remove old hostname entry for a VM when adding a VM
...
When adding a VM, it adds an entry to /etc/hosts file on the VR but does not
clear up any older entries for the VM with a same name. The fix uncomments the
command that removes any old entries in the VM.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 63298d9b74
2014-12-10 18:25:22 +05:30
ef3b4bb4e3
made iptables for the VPN connection more secure
...
Added destination and source definition. Flag -S can be used
to ignore this. It's the new default as it is more secure
and does not impact the way things work (backwords compatible).
2014-12-08 19:06:55 +01:00
7f33f7c396
prevent CloudStack from removing the VPN connection
...
If connecting the VPN takes some time, for example because
the other end is not (yet) up, CloudStack will delete
the VPN because the ipsectunnel.sh does not return in time.
The VPN connection then enters the Error state.
This change makes sure ipsectunnel.sh returns in time,
and lets ipsec connect in the background. If it all fails,
the connection enters Disconnected.
2014-12-08 19:00:59 +01:00
f8d718e3e3
add a flag -c whether or not to check the VPN on create
...
Changed default to no, as the other side may not be up yet.
If this check fails, the VPN enters Error state and will not
work. It's safe to just let it connect on its own so it will
connect when it can.
2014-12-08 18:59:16 +01:00
b95addd3ef
starting the tunnel will make it keep trying until it connects
...
Changed 'auto=add' to 'auto=start' to make sure the tunnel starts.
When both sides are there they will connect. This resolves the
issue that there is only a small time frame in which the VPN
would connect.
2014-12-08 18:55:35 +01:00
8b2563a216
renamed $leftgw to $leftnexthop to make clear what it does
2014-12-08 18:54:27 +01:00
8b412ce194
remove biglock usage from ipsectunnel.sh
...
Biglock breaks creating VPN's when other scripts run at the
same time that also use the same biglock. These other scripts
do nothing that could harm our deployment and even multiple
vpn's can safely be created simultaniously.
2014-12-08 18:53:18 +01:00
4eedfe53fc
CLOUDSTACK-2823: pass cmdline info to system vms for 30 times
2014-12-08 15:45:29 +01:00
f73ad2e8b3
console-proxy add support of AltGr key and FR azerty keyboard
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 18:05:43 +05:30
4722fa3de9
Merge branch '4.5'
...
Conflicts:
client/WEB-INF/classes/resources/messages_ja_JP.properties
client/WEB-INF/classes/resources/messages_zh_CN.properties
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/event-bus/rabbitmq/pom.xml
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/VolumeApiServiceImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
setup/db/db/schema-442to450.sql
test/integration/component/test_persistent_networks.py
This closes #53
2014-12-08 15:27:53 +05:30
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
18b230db74
Revert "Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated"
...
This reverts commit 83656a6ea8
2014-12-05 15:17:55 +01:00
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
a72f14ea9c
Ensure the response is a proper http response.
...
Tested that cloud-set-guest-password.sh still works after this change.
Reviewed-by: Daan Hoogland <daan@onecht.net>
2014-12-02 16:36:49 +01:00
66e805cba9
Fixes: Hardcoded strings externalized from various JS files.
...
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-21 08:02:49 -08:00
83656a6ea8
Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated
...
Signed-off-by: Edison Su <sudison@gmail.com>
2014-11-20 11:00:09 -08:00
50d756e87d
Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated
...
Signed-off-by: Edison Su <sudison@gmail.com>
2014-11-20 10:58:35 -08:00
50b262e02a
CLOUDSTACK-7944: Ensure ipv6 is enabled in sysctl.conf
...
The booting sequence result in change of IPv6 related sysctl options was
overrided by sysctl.conf which is loaded later.
So this patch would patch sysctl.conf in VR as well, ensure IPv6 would be
enabled during booting period otherwise the network setup may not work, result
in IPv6 VM deployment failure.
2014-11-19 14:50:03 -08:00
bb352da302
CLOUDSTACK-7944: Ensure ipv6 is enabled in sysctl.conf
...
The booting sequence result in change of IPv6 related sysctl options was
overrided by sysctl.conf which is loaded later.
So this patch would patch sysctl.conf in VR as well, ensure IPv6 would be
enabled during booting period otherwise the network setup may not work, result
in IPv6 VM deployment failure.
2014-11-19 14:49:18 -08:00
fd03091c81
Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"
...
This reverts commit e1c788ca3c
2014-11-14 11:44:53 -08:00
2d3b3376e3
Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"
...
This reverts commit e1c788ca3c
2014-11-14 11:43:03 -08:00
7f2219bcbb
CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some EN- UK keyboard keys.
2014-11-13 19:16:02 +05:30
1cc733bfd5
Logrotate is called from crontab. Debian crontab does not include everything in it's path. Therefore reference to these bins need to be absoluut.
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-09 13:18:08 +01:00
1e1cc11d9a
Logrotate is called from crontab. Debian crontab does not include everything in it's path. Therefore reference to these bins need to be absoluut.
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-09 13:13:56 +01:00
a014617085
CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic
...
The fix also persists the configuration in /etc/network/interfaces
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-06 18:21:32 +05:30
c8ad4d15fd
CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic
...
The fix also persists the configuration in /etc/network/interfaces
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-06 18:19:11 +05:30
e6533b3684
CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation
...
fails on the Numeric Del. key for US 101 keyboard.
2014-11-06 13:33:57 +05:30
04a6063ba8
CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation
...
fails on the Numeric Del. key for US 101 keyboard.
2014-11-06 13:32:09 +05:30
c15ed74f63
CLOUDSTACK-7841: Gracefully reload haproxy config
...
The old way would disconnect all the existing connections through haproxy when
reload the config.
This new way would ensure that all the existing connections would still alive
after reload the config.
2014-11-04 16:41:46 -08:00
4b3217fe57
CLOUDSTACK-7841: Gracefully reload haproxy config
...
The old way would disconnect all the existing connections through haproxy when
reload the config.
This new way would ensure that all the existing connections would still alive
after reload the config.
2014-11-04 16:40:47 -08:00
84e44a4dba
systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)
...
Just prefer TLS over SSL in apache configuration in systemvm
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 88acc9bd53
2014-11-04 01:50:06 +05:30
88acc9bd53
systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE20143566)
...
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
e1c788ca3c
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:24:57 -07:00
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
9d5b7b73a2
MTU should be put on storage network: eth3, instead of eth1 Reviewed-by: Frank
2014-10-30 02:45:46 -07:00
4ebaf0a583
Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT
2014-10-29 14:54:23 +01:00
1de0cb7094
restore barematel work after merge
2014-10-17 10:24:01 +02:00
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
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
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
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
ac48aa8e0c
cleaning up some from a revert
2014-10-12 23:30:04 -04:00
6dd3a91864
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
fix baremetal-vr.py license header
2014-10-06 16:07:51 -07:00
01dada100a
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-10-06 16:03:19 -07:00
3e02bfa74f
CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation policies on SSVM and CPVM
2014-10-01 13:39:09 +05:30
bdf7d65305
CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware.
2014-09-29 11:54:57 +05:30
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
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
6155d3ecaa
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-22 13:57:32 -07:00
8b89494a35
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
dec9133dcd
CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval
...
(cherry picked from commit 4d065b9a3a
2014-09-18 12:51:10 +02:00
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
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
3cb6d4a4df
CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc
2014-09-15 14:54:13 +05:30
b4f03a1339
CLOUDSTACK-7517: loading ftp modules in VR
2014-09-10 14:10:14 +05:30
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
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
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
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 45deade1dfc4d1bf7f24
2014-08-14 14:11:33 +02:00
2ff7b846fd
CLOUDSTACK-7185: Change Apache2 log rotation policy to avoid memory leak
2014-07-25 14:02:44 -07:00
1ad1883b74
Add virtualbox support to cloud-early-config so we can use virtualbox for testing
2014-07-14 15:34:14 +02:00
e0d4af5062
CLOUDSTACK-7092: Disabled icmp redirects in VR
2014-07-10 15:17:50 +05:30
2f1b40d2e8
CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over
2014-07-01 15:16:27 +05:30
d5e686f2ec
CLOUDSTACK-6997: Increase proc ip_conntrack_max
2014-07-01 10:29:46 +05:30
563934c989
CLOUDSTACK-3540: Fix edithosts.sh on matching tag
2014-06-27 17:18:38 -07:00
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
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
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
b85dd956f8
rats
2014-06-10 16:21:06 +02:00
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
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
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
d093a8a7b4
CLOUDSTACK-6328: added license header and removed white space
2014-05-27 15:56:47 +05:30
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
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
6052a181dd
CLOUDSTACK-6714: monitor script echo service command is added with quotes
2014-05-20 14:11:19 +05:30
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
d4f167032b
Fixed vpc private gateway backend issues
2014-05-07 16:33:46 +05:30
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
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
d1658c4282
CLOUDSTACK-6494: Typing a pipe '|' character in VM console returns a question mark and pipe '?|'.
2014-04-24 13:28:30 +05:30
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
a554ebdf75
CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network
...
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.
2014-04-16 19:13:23 -07:00
2a0236931a
Ensure that min_free_kbytes in secstorage vm is set such that heavy nfs load will not cause page allocation failures
2014-04-14 00:00:47 -06:00
ecc71518a9
CLOUDSTACK-6253: Optimizing VR alerts getting algorithm In addition to this a new configuration parameter is added router.alerts.check.interval defaulted to 30minutes to check for alerts in Virtual Router
2014-04-09 18:12:20 +05:30
6b7f91d770
add conntrackd logrotate for systemvms, dont start conntrackd on logrotate if it isnt running
2014-04-05 00:30:28 -06:00
cd79306021
CLOUDSTACK-6285: Fix savepassword.sh script for clear out old entries
2014-03-25 15:56:15 -07:00
d3973ed081
CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
2014-03-14 13:36:43 -07:00
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
f7337527cf
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-14 15:14:15 +05:30
8937434fce
CLOUDSTACK-5986: Fix dnsmasq lease for VPC
2014-03-11 16:14:33 -07:00
540d020aa5
CLOUDSTACK-6179 Execute VR commands on Virtual Resource when commands received to Hyper-V
2014-03-11 13:10:13 +05:30
a4d3ec476f
CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they
...
don't use fully qualified path as script name. Fix for
commit 9dd57c22b0
2014-03-10 16:11:52 -06:00
d033ca486b
CLOUDSTACK-6220: Fix cloudstack init scripts so that they
...
don't use fully qualified path as script name. Fix for
commit 9dd57c22b0
2014-03-10 15:34:55 -06:00
09c375379d
CLOUDSTACK-6204: removing realhostip dependency
...
Moving default transport for console proxy, SSVM to http.
See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.
jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.
Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
ccea5703df
CLOUDSTACK-6047: Add testing for VR aggregation commands
2014-03-06 16:22:23 -08:00
60dc25450a
CLOUDSTACK-6047: Introduce Aggregated commands queue to VR
2014-03-06 16:22:01 -08:00
986813d973
Prevent DHCPACK for DHCPINFORM in the DHCP server
...
The orignal "dhcp-range=xxx,static" would only prohibit DHCPREQUEST from unknown
hosts, but not DHCPINFORM which can request routing information. This caused
trouble for some bridged networks outside CloudStack.
This patch would fix the issue, prevent dnsmasq from acking any unknown request.
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-02-25 14:55:24 -08:00
c0ed0b7819
CLOUDSTACK-6047: Make VR LB script accept a file name
...
Rather than default filename everytime since in aggregated commands the file
would be overrided if the filename is same.
2014-02-21 18:26:42 -08:00
9dd57c22b0
CLOUDSTACK-6129: removing hard-coded script names
...
Replacing whatami with $0 which is how UNIX shell scripts should get the
script's name.
BUG-ID: CLOUDSTACK-6129
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1392660036 -0800
2014-02-17 10:00:36 -08:00
11c5574b05
CLOUDSTACK-5966 enable/disable global setting for service monitor in VR
2014-02-11 15:35:02 +05:30
c39ec1eb8f
CLOUDSTACK-6062: nic device ids don't always correspond to
...
'eth' device numbers, but vpc scripts require it. Now we match
based on mac.
2014-02-07 14:59:40 -07:00
66989a9364
CLOUDSTACK-6018: Increase dnsmasq dhcp-lease-max to 2100
...
Would able to accomodate one /21 network then.
2014-02-03 14:52:42 -08:00
f2f605dfda
CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering
...
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
2014-01-31 10:39:30 +05:30
121d88743a
CLOUDSTACK-5986: Make dnsmasq handle dnsmasq.leases when dhcp_release is available
...
The original issue has been exposed due to CloudStack VR would modify the
dnsmasq.leases, thus make it unsync with dnsmasq's memory lease.
Make the modification to let dnsmasq handle the lease file if dhcp_release is
available.
2014-01-29 18:02:11 -08:00
7ac48934f7
CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
2014-01-28 07:03:08 +05:30
807dc09138
CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV
2014-01-28 07:03:08 +05:30
1767ddac77
CLOUDSTACK-5779: Update vmdata command in Vmware
...
To use Gson rather than copy a file to it, follow the same as Xen and KVM.
2014-01-21 18:59:30 -08:00
e88cc488e5
CLOUDSTACK-5779: Move loadbalancer to use routerProxy
2014-01-20 18:48:46 -08:00
0ea1c7dfc4
CLOUDSTACK-5779: Move firewall to use routerProxy
2014-01-17 12:36:42 -08:00
ce67e24d0a
CLOUDSTACK-5779: Move ipAlias to use routerProxy
2014-01-17 12:36:42 -08:00
0cdf0f6f67
CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy
2014-01-16 16:03:09 -08:00
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
f6b063de79
CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM.
2013-12-27 18:17:22 +05:30
238eda30ae
CLOUDSTACK-5592 ssh should run on eth1 interface in ssvm/cpvm running in HyperV
2013-12-27 14:57:52 +05:30
dde7a5f43e
CLOUDSTACK-5559 Add CIFS support in ssvm-check script
2013-12-27 14:49:26 +05:30
26858c16ee
CLOUDSTACK-4535 Fixed issue in PF in connecting from private nw when public and private ports are different
2013-12-19 10:57:18 +05:30
e54d1dec9d
CLOUDSTACK-5533: Disable VR's DNS functionality if user choose to use external dns
...
Also fix the regression that external dns won't be used if "dns" service in the
network offering is unset.
2013-12-17 16:06:58 -08:00
3ccdf67dfb
CLOUDSTACK-5297: Fix ACL rules on VPN for VPC
...
Insert a new iptables chain for FORWARD chain, in order to let following ACL
rules being executed as well.
2013-12-09 17:32:04 -08:00
764dec45fd
Monitoring python script removed semicolon
2013-11-26 11:24:37 +05:30
c1ed540af8
Monitoring python script organized into more methods
2013-11-26 10:07:20 +05:30
0be4a685e8
CLOUDSTACK-5164 Unmonit for 30 minutes for a failed process
2013-11-25 15:12:48 +05:30
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
7dceca5995
CLOUDSTACK-5177: Fixed issue with running script from cron job
2013-11-15 12:05:19 +05:30
416206595e
CLOUDSTACK-4736 Fixed issue in default service selection
2013-11-07 17:11:03 +05:30
27ce69fd55
CLOUDSTACK-5066: Don't remove the current VPN users when updating
...
If one VPN user and password is existed in current setup, then don't touch it,
otherwise would result in this user's existing connection be dropped.
2013-11-06 15:32:08 -08:00
b464a20a52
CLOUDSTACK-4736: Monitoring services in VR
2013-11-05 23:39:33 +05:30
479f404aea
Fix several rat issues introduced by recent commits
2013-11-04 20:14:46 +01:00
989c6e6914
Modified cloud-early-config to configure, when the VR boots up in HyperV Environment
...
Implemented commands that are required for VR to bootup and Vm deployment to work
Modified hyperv agent code, to deploy VR with Boot Args, boot args passed to VR using KVP Exchange Component.
Fix for VR to boot up and get configured with boot args, Fixed issue in VolumeOrchestrator
Implemented SetFirewallRulesCommand in HyperV Resource
Implemented VR network commands to provide the necessary services from VR
Fixed hyperv localstorage path encode url issue. encode is converting space to '+'
2013-11-04 18:48:53 +05:30
3205cd42b5
CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
...
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.
Test case also included.
The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -07:00
484d6c4eb7
CLOUDSTACK-2792: Call savepassword.sh inside VR
...
Also only set password when password service is running, thus avoid setting for
redundant router BACKUP router.
2013-10-17 20:04:44 -07:00
85dc65c7f7
CLOUDSTACK-4786: Reset Redundant Router priority after all the routers are stopped
...
This patch would reset the priority in such condition:
1. All redundant routers are stopped, e.g. due to network GC
2. User start one VM in the network
3. The routers would be brought up with reseted priority(100 & 99).
This would resolve the issue of network GC result in lower limit of redundant router priority reached.
2013-10-17 20:00:48 -07:00
4188916638
Add one more license header to agent.properties.ssvm
2013-10-14 12:08:11 -06:00
d430473fe0
add missing license headers to PasswordGeneratorTest.java and an agent.properties
2013-10-14 11:56:21 -06:00
71dc43ebb0
Remove duplicate scripts and move the remaining items to the systemvm project
2013-10-14 08:02:35 +02:00
23ddf29532
Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist
2013-10-07 09:20:41 -07:00
4e47577fbd
Make the dist dir for the systemvm when it is needed
2013-09-20 19:33:41 +08:00
6c26104282
Move the system vm to a separate maven project.
...
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00
Ian Southam
Hugo Trippaers
Leo Simons
Rohit Yadav
René Moser
ramamurtis
Rajani Karuturi
Jayapal
Remi Bergsma
Wei Zhou
Axel Delahaye
Sheng Yang
vetrivelc
David Bierce
Sanjay Tripathi
Joris van Lieshout
Edison Su
Daan Hoogland
Saksham Srivastava
David Nalley
Frank Zhang
Bharat Kumar
Fred Clift
Wido den Hollander
Saurav Lahiri
Nitin Mehta
Marcus Sorensen
Harikrishna Patnala
Rajesh Battala
John Kinsella
Koushik Das
Alex Huang
Darren Shepherd