Commit Graph

25797 Commits

Author SHA1 Message Date
Brian Federle 2feef1722d ja_JP: Fix truncated column headers on multi-edit 2014-12-09 12:24:06 -08:00
Gaurav Aradhye c4d383786f CLOUDSTACK-8053: Fix loop termination - test_vpc_host_maintenance.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:44 +05:30
Gaurav Aradhye f07c6bce49 CLOUDSTACK-8049: Tagging test cases which cannot be run on simulator accordingly
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:34 +05:30
Gaurav Aradhye 0977140043 CLOUDSTACK-8048: Fix test_ss_limits.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-12-09 19:01:27 +05:30
Sateesh Chodapuneedi aa84b05491 CLOUDSTACK-5933 Problem with VMware snapshot when datastore has a space in its name
Handling spaces in datastore name while extracting vmdk base name

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-12-09 05:34:41 +05:30
Rohit Yadav ca121336a0 Merge remote-tracking branch 'worldline/master'
This closes #55

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-09 17:36:43 +05:30
Jean-Francois Vincent 068e508e3b Add the Userdata setting to the UI on VM creation step 2014-12-09 11:32:49 +01:00
Daan Hoogland 1a99c39da1 Merge remote-tracking branch 'origin/4.5' 2014-12-09 11:28:36 +01:00
Remi Bergsma a592b01035 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).

(cherry picked from commit ef3b4bb4e3)
2014-12-09 11:19:43 +01:00
Remi Bergsma 85ba1f76a4 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.

(cherry picked from commit 7f33f7c396)
2014-12-09 11:19:30 +01:00
Remi Bergsma cbc4fa2e9c 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.

(cherry picked from commit f8d718e3e3)
2014-12-09 11:19:20 +01:00
Remi Bergsma e89f09aa51 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.

(cherry picked from commit b95addd3ef)
2014-12-09 11:19:07 +01:00
Remi Bergsma 08ab9a3769 renamed $leftgw to $leftnexthop to make clear what it does
(cherry picked from commit 8b2563a216)
2014-12-09 11:18:59 +01:00
Remi Bergsma bf7cd8a9f0 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.

(cherry picked from commit 8b412ce194)
2014-12-09 11:18:10 +01:00
Daan Hoogland 76bb54b777 Merge branch 'master' of https://github.com/remibergsma/cloudstack 2014-12-09 10:44:30 +01:00
Koushik Das ef9830d6a4 Merge branch '4.5'
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	tools/appliance/build.sh
2014-12-09 14:59:36 +05:30
Wei Zhou 0fc07e6ea8 [UI] bug fix: update vm info after add/remove nic 2014-12-09 09:55:40 +01:00
Wei Zhou bbca8cda94 [UI] list only non-existing networks when Add network to VM 2014-12-09 08:44:06 +01:00
Wei Zhou 13205e6be1 CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes 2014-12-09 08:21:35 +01:00
Koushik Das 016d009adf CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
The last commit 513adab51b didn't fully fix it. Scenario #1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
2014-12-09 11:46:45 +05:30
Jessica Wang f2fe127901 CLOUDSTACK-8023: UI > VM wizard > network > trigger event handler of event "cloudStack.module.instanceWizard.network.dataProvider" to get networkObjsToPopulate if module is enabled. 2014-12-08 17:13:09 -08:00
Jessica Wang 417239e440 CLOUDSTACK-8047: UI > zone wizard > add primary storage step: (zone-wide-primary-storage) fix a bug that failed to get cluster's hypervisor value if previous step (e.g. add host step) has ever failed. 2014-12-08 15:19:32 -08:00
Jessica Wang 0af15e4a2c CLOUDSTACK-8047: UI > zone wizard > add primary storage step: (zone-wide-primary-storage) fix a bug that failed to get cluster's hypervisor value if previous step (e.g. add host step) has ever failed. 2014-12-08 15:18:01 -08:00
Sateesh Chodapuneedi bca015306e CLOUDSTACK-7803 Storage live migration of instance may not happen if instance has ISO attached.
BUG-ID:CLOUDSTACK-7803
Summary:Ensure secondary storage is mounted on target host.
Reviewed-By:Rajesh

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-12-09 03:27:31 +05:30
Mike Tutkowski be38b97066 Fixing an issue related to figuring out the name of a datastore that is backed by managed storage 2014-12-08 14:40:49 -07:00
Mike Tutkowski 3ac8f8d601 Fixing an issue related to figuring out the name of a datastore that is backed by managed storage 2014-12-08 14:26:31 -07:00
Remi Bergsma 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
Remi Bergsma 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
Remi Bergsma 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
Wei Zhou dd700be263 [UI] bug fix: fix update Networks in sub-domain issue by adding listAll=true in listNetworks 2014-12-08 18:58:25 +01:00
Remi Bergsma 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
Remi Bergsma 8b2563a216 renamed $leftgw to $leftnexthop to make clear what it does 2014-12-08 18:54:27 +01:00
Remi Bergsma 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
Rohit Yadav 3dccbe3dc0 developer: increase disable thresholds global settings for developers
- Increases the disable thresholds for developers
- Removes the use local storage for systemvms

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 314e2dacee)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 21:59:52 +05:30
Rohit Yadav d276c0faab developer: increase disable thresholds global settings for developers
- Increases the disable thresholds for developers
- Removes the use local storage for systemvms

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 314e2dacee)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 21:59:10 +05:30
Daan Hoogland b0845150fb Merge branch 'hotfix/4.5-7959' into 4.5 2014-12-08 16:47:26 +01:00
Wei Zhou 4eedfe53fc CLOUDSTACK-2823: pass cmdline info to system vms for 30 times 2014-12-08 15:45:29 +01:00
Daan Hoogland ad59970d37 specifying MinVRVersion as 4.5.0 for the 4.5 branch 2014-12-08 15:40:39 +01:00
Wei Zhou ca5c800f8d Fix CloudStack version (4.6.0) in systemvm template 2014-12-08 15:26:56 +01:00
Axel Delahaye 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
Daan Hoogland 05b2ec4f55 Merge branch 'hotfix/CID-1256277' 2014-12-08 12:40:08 +01:00
Rajani Karuturi 701199fca7 Merge branch '4.5' 2014-12-08 16:30:44 +05:30
Sudhansu 0347b2f5f3 CLOUDSTACK-7986 [F5 LB] Failed to execute IPAssocCommand due to com.cloud.utils.exception.ExecutionException: Exception caught in Networking::urn:iControl:Networking/VLAN::create()
added 3 new method to strip partition information from VirtualServer, LBPool, VLAN api response.

With BigIP V11.x VirtualServer, LBPool, VLAN api response has been modified.
Now BigIP returns resource  name with user partition information
ex: if vlanname is vlan-100 then the get_list() will return /Common/vlan-100 (/Common -> Suer portition)
This method will strip the partition information and only returns a list with vlan name (vlan-100)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-12-08 15:46:58 +05:30
Rajani Karuturi b61733d040 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2014-12-08 15:28:41 +05:30
Rajani Karuturi 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
Rohit Yadav eb666453f3 CLOUDSTACK-6212: auto_increment for some other resource tables
This fix alters table columns which are primary keys but don't have them
auto_increment such as region, domain_router, user_vm etc.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a11ddf3077)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 14:48:04 +05:30
Rohit Yadav a60d232d07 CLOUDSTACK-6212: Let vm_instance table's ID field be unique and auto_increment
`vm_instance` table's id column is unique but does not auto_increment like other
resource tables. The fix simply alter the table's id column to have it
auto_increment which may avoid id conflicts in a multi-master mysql setup.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e1e5e12aaa)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 14:47:58 +05:30
Rohit Yadav 57a210ede9 Merge branch 'hotfix/CLOUDSTACK-6212' into 4.5
This closes #52

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-08 14:46:23 +05:30
Jayapal 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
Nitin Mehta b1e4c6db07 Revert "Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.""
This reverts commit 24aaf19239.
2014-12-08 11:20:49 +05:30