Commit Graph

30936 Commits

Author SHA1 Message Date
dahn 7d97a07333 repo has moved
from git-wip-us to gitbox
2017-08-10 09:16:52 +02:00
Rohit Yadav f84728d374 Merge branch '4.10' 2017-08-10 01:59:34 +02:00
Rohit Yadav d9b7b8cb62 Merge branch '4.9' into 4.10
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-10 01:39:14 +02:00
Rohit Yadav 92b07d453f CLOUDSTACK-10000: Fix vpn_users component test
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-10 01:31:28 +02:00
ustcweizhou aee3dbb49a CLOUDSTACK-10000: Fix remote access vpn does not work due to '#' in password (#2182) 2017-08-10 01:30:21 +02:00
Rohit Yadav 542b7e6608 CLOUDSTACK-8958: Fix typos introduced
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-10 01:12:59 +02:00
Wei Zhou 5645164dbb CLOUDSTACK-8958: release dedicated ip range in domain removal 2017-08-10 01:11:51 +02:00
Rohit Yadav d17728dd7e Merge branch '4.10' 2017-08-10 01:04:54 +02:00
Rohit Yadav cf6c949310 Merge branch '4.9' into 4.10 2017-08-10 01:04:04 +02:00
Wido den Hollander 86b6050c32 CLOUDSTACK-10042: Properly show ICMP SecGroup Rules (#2233)
A simple if-statement would fail if either the type or code were 0
as that if-statement failed them.

By checking if they are defined and casting them to a String afterwards
this makes the if-statement properly resolve and show the rule as it should.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2017-08-10 01:03:35 +02:00
Boris Stoyanov - a.k.a Bobby 18ffd7b199 CLOUDSTACK-10036: Decreasing timeout of failing unit test (#2228)
This test occasionally fails on CentOS6 environments by failing to meet the 2000 milliseconds threshold. Usually it ends up executing the method for ~1100. So decreasing the timeout to 1000 would prevent it from failing.
2017-08-08 11:50:07 +02:00
Abhinandan Prateek d7f5b929b2 CLOUDSTACK-9861: Expire VM snapshots after configured duration (#2026)
Default value of the account level global config vmsnapshot.expire.interval is -1 that conforms to legacy behaviour. A positive value will expire the VM snapshots for the respective account in that many hours.
2017-08-06 00:13:17 +02:00
Mowgli 3614f8aae2 CLOUDSTACK-9608: Errored State and Abandoned state Templates are not displayed on UI. (#1774)
Errored and Abandoned Templates should also be displayed on UI so that user has the accessibility to delete the template even before the clean up thread is run. Refer - CLOUDSTACK-9608
2017-08-06 00:10:26 +02:00
Wido den Hollander 2867080979 CLOUDSTACK-10034: Use libvirt to create new volumes and not rados-java (#2039)
Since libvirt 1.2.2 libvirt will properly create volumes
using RBD format 2.

We can use libvirt to creates the volumes which strips a bit of
code from the CloudStack Agent's responsbility.

RBD format 2 is already used by all volumes created by CloudStack.

This format is the most recent format of RBD and is still actively
being developed.

This removes the support for Ubuntu 12.04 as that does not have the
proper libvirt version available.

Signed-off-by: Wido den Hollander wido@widodh.nl

We can use libvirt to creates the volumes which strips a bit of
code from the CloudStack Agent's responsbility.

RBD format 2 is already used by all volumes created by CloudStack.

This format is the most recent format of RBD and is still actively
being developed.

This removes the support for Ubuntu 12.04 as that does not have the
proper libvirt version available.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2017-08-06 00:04:21 +02:00
niteshsarda 6203013ec6 CLOUDSTACK-9955 : Featured Templates/Iso's created by Root/admin user are not visible to Domain Admin users (#2144)
ISSUE: Featured Templates/Iso's created by Root/admin user are not visible to Domain Admin users.

STEPS TO REPRODUCE

Mark a template as featured and try to view it from a domain admin user
The issue occurs for both templates and iso's registered before and after upgrade
Templates,ISO's whose owner is ROOT admin, public: Yes, featured: Yes
Log in to UI (as a domain admin, such as an admin of “TEST/TEST1” domain)
Choose “Templates”.
Error message will be shown on UI
2017-08-04 20:59:07 +02:00
Rohit Yadav ccf2f52041 Merge branch '4.10' 2017-08-04 20:46:05 +02:00
Rohit Yadav ddd8462022 Merge branch '4.9' into 4.10 2017-08-04 20:45:45 +02:00
Slair1 a5778139c2 CLOUDSTACK-9801: IPSec VPN does not work after vRouter reboot or recreate (#1966)
This makes sure IP address is active.

After a vRouter is recreated (e.g. reboot via CloudStack UI) and Remote Access VPN enabled, VPN won't work anymore. Here is the abbreviated output of "ipsec auto -status" while we were having the issue:

root@r-10-VM:~# ipsec auto --status
000 using kernel interface: netkey
000 interface lo/lo 127.0.0.1
000 interface lo/lo 127.0.0.1
000 interface eth0/eth0 169.254.1.45
000 interface eth0/eth0 169.254.1.45
000 %myid = (none)
After this commit, the following occurs and VPNs work:


root@r-10-VM:~# ipsec auto --status
000 using kernel interface: netkey
000 interface lo/lo 127.0.0.1
000 interface lo/lo 127.0.0.1
000 interface eth0/eth0 169.254.1.45
000 interface eth0/eth0 169.254.1.45
000 interface eth1/eth1 xxx.xxx.xxx.172
000 interface eth1/eth1 xxx.xxx.xxx.172
000 interface eth2/eth2 192.168.1.1
000 interface eth2/eth2 192.168.1.1
000 %myid = (none)

eth1 interface IP is masked, but now ipsec sees all the interfaces and VPN works.

Looks like this bug was introduced by Pull Request #1423

It added code to start ipsec (cloudstack/systemvm/patches/debian/config/opt/cloud/bin/configure.py)

if vpnconfig['create']:
    logging.debug("Enabling remote access vpn on "+ public_ip)
    CsHelper.start_if_stopped("ipsec")
2017-08-04 20:43:54 +02:00
Rohit Yadav b204e4a5b9 Merge branch '4.10' 2017-08-04 10:58:59 +02:00
Rohit Yadav 84ad4c7057 Merge branch '4.9' into 4.10 2017-08-04 10:58:21 +02:00
Rohit Yadav f4a138d251 Revert "CLOUDSTACK-9708: Router deployment failed due to two threads start VR simultaneously." (#2220)
This reverts commit 42e60ebac6 / 9e20525e08.
2017-08-04 10:57:54 +02:00
Frank Maximus 1414d20852 CLOUDSTACK-9749: Disable password service on ilb systemvm (#1912)
Fix cloud-password-srvr correctly.
Made sure it runs on VPC VR, but not on Internal LB
2017-08-03 22:38:25 +02:00
SowjanyaPatha 9fe5630c71 CLOUDSTACK-9944: In Cluster Management Server, Sometimes hosts stays in disconnected state (#2138)
In clustered management server setup on simultaneous restart of management server, sometimes hosts stays in disconnected state.
2017-08-03 22:34:23 +02:00
dahn 597df24b53 CLOUDSTACK-10007: Isolation methods (#2193)
Change isolation methods from an enum to a registry based construct to enhance pluggability
2017-08-03 12:20:37 +02:00
Rohit Yadav 98dc4eb96a CLOUDSTACK-9782: New Background Polling Task Manager (#2218)
CloudStack has several background polling tasks that are spread across
the codebase, the aim of this work is to provide a single manager to
handle submission, execution and handling of background tasks. With
the framework implemented, existing oobm background task has been
refactored to use this manager.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-03 11:53:45 +02:00
SudharmaJain 5397106a76 CLOUDSTACK-8906: /var/log/cloud/ doesn't get logrotated on xenserver (#883)
After integrating XS with CCP the following folder gets created: /var/log/cloud/ however the logs in that are not rotated resulting in root file system fill up. It was a known issue and link http://support.citrix.com/article/CTX138064 describes the issue and solution. Used the article and added corresponding changes to Cloudstack.
2017-08-03 00:51:16 +02:00
Gabriel Beims Bräscher e0b6dcbe4a CLOUDSTACK-9925: Quota memory tariff value is for 1MB of RAM used per month (not hour) (#2119)
The quota memory tariff description in the CloudStack UI is wrong when defines that the value is for "using 1MB or RAM for 1 hour". The quota currency values reflect the value of a resource used per month, not an hour.

Quota divides the tariff value by the number of hours a month has (30 days - 720 hours); then it calculates the credits used by a client based on the amount of resources used per hour. The memory tariff description in the interface is wrong and can guide users to configure values for an hour.
2017-08-03 00:47:33 +02:00
Rashmi D e43a4b9a09 CLOUDSTACK-9697: Added better error message user if tries to shrink (#2145)
the VM ROOT volume size

Skip the API call altogether if the UI detects this and throw a more user friendly message
2017-08-03 00:45:45 +02:00
mrunalinikankariya b936feb108 CLOUDSTACK-9950:listUsageRecords doesnt return required fields (#2137)
There is no cpuspeed, cpunumber or memory details in the listUsageRecords output as documented
In DB (cloud_usage table) we have cpu_speed, cpu_cores and ram fileds, but these are not populated for all the VM's. These fields are only populated for the VM's which are deployed with custom service offerings.
2017-08-03 00:39:57 +02:00
Olivier Lemasle 43ae8e3503 CLOUDSTACK-9840: Fix datetime format of snapshots events (#2008)
Include the timezone in datetime format of snapshot events, to be consistent
with every other events.
"eventDateTime" was added by @chipchilders in commit 14ee684ce3 and was
updated the same day to add the timezone (commit bf967eb622) except for
Snapshots.
2017-08-03 00:31:49 +02:00
Rohit Yadav 1d95cbbfed Merge branch '4.10' 2017-08-03 00:31:12 +02:00
Rohit Yadav b60e173c5c Merge branch '4.9' into 4.10 2017-08-03 00:29:24 +02:00
Ronald van Zantvoort 974e01ed08 CLOUDSTACK-10011: Fix Agent logrotation (#2094)
* CS Agent: Correct logrotation for agent log
* CS Agent: Logrotate security_group as well
* CS Agent: fix logrotation file perms so logrotate doesnt skip it
2017-08-03 00:29:02 +02:00
SowjanyaPatha 7fea069e8a CLOUDSTACK-9954 Unable to create service offering with networkrate=0 (#2142)
Unable to create service offering with networkrate=0(Unlimited network throttling) with an error "Failed to create service offering xxxxxxx: specify the network rate value more than 0".
2017-08-03 00:19:38 +02:00
Nitin Kumar Maharana 1b898d610c CLOUDSTACK-8961: Changes related to the UI of VPN Users management. (#2130)
The current VPN users are added in the VPN tab inside the public IP after the VPN is enabled. For each network(for which VPN is supported and enabled), the VPN users are shared. As the Cloudstack doc says “ The account owner can create and manage users for their VPN. CloudStack does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.”

The current implementation of going inside each network and adding VPN users give the first feel as if the users are network based. To fix this, Shifted the VPN users to networks tab view.
2017-08-03 00:14:53 +02:00
Rohit Yadav 5ccbe04c0a Merge branch '4.10'
This uses `ours` fwd-merging strategy.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:45:33 +02:00
Rohit Yadav d53f500977 Merge branch '4.9' into 4.10
This merge uses `ours` strategy for forward merging.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:44:25 +02:00
subhash yedugundla b70879cbac CLOUDSTACK-9560 Root volume of deleted VM left unremoved
(cherry picked from commit 5568ee93ad)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Nitesh Sarda 26bcb9afd8 CLOUDSTACK-9935 : Search in VPN Customer Gateway not working
(cherry picked from commit fdadc7b760)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Subhash yedugundla aaae977c53 CLOUDSTACK-9555 when a template is deleted and then copied over again , it is still marked as Removed in template_zone_ref table
(cherry picked from commit c3bc69c724)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sudharma Jain 96671543dc CLOUDSTACK-9567 Difference in the api call outputs for CAPACITY_TYPE_CPU = 1
(cherry picked from commit 732be53044)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Subhash Yedugundla 77fb2c92ce CLOUDSTACK-9592 Empty responses from site to site connection status are not handled propertly
(cherry picked from commit ddf8fd514a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Priyank Parihar 30bb5587d2 CLOUDSTACK-9610: Disabled Host Keeps Being up status after unmanging cluster.
(cherry picked from commit 4b165f1b8f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sateesh Chodapuneedi 6977cb3841 CLOUDSTACK-9684 Invalid zone id error while listing vmware zone
Issue
=====
While listing datacenters associated with a zone, only zone Id validation is required.
There is no need to have additional checks like zone is a legacy zone or not.

Fix
===
Removed unnecessary checks over zone ID and just checking if zone with specified ID exists or not.

Signed-off-by: Sateesh Chodapuneedi <sateesh.chodapuneedi@accelerite.com>
(cherry picked from commit 0ef1c17541)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sudhansu f8f71a5af6 CLOUDSTACK-9694: Unable to limit the Public IPs in VPC
Added missing clause to check for vpc_id

(cherry picked from commit cdf2b0727a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Anshul Gangwar 75c81d918a CLOUDSTACK-9705: Unauthenticated API allows Admin password reset
Now, Updating the password via UpdateUser API is not allowed via integration port

(cherry picked from commit d206336e1a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sudhansu 8240bc4aa2 CLOUDSTACK-9701: When host is disabled/removed,
capacity_type for local storage in op_host_capacity
is still enabled

(cherry picked from commit e06e3b7cd4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sudhansu 4bacb64994 CLOUDSTACK-9842: Unable to map root volume usage to VM
removed code which nullifies  vm_instance_id
Also modified QueryManagerImpl to ignore volume which does not have uuid. This is to avoid duplicate volume listing.

(cherry picked from commit 3cced927c4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
Sudhansu 1535afe158 CLOUDSTACK-9843 : Performance improvement of deployVirtualMachine, createFirewallRule, createPortForwardingRule
removed 1 sec sleep in SSHHelper.

(cherry picked from commit 28bb8ba1e4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00
SudharmaJain af6c28b3ce CLOUDSTACK-8910: The reserved_capacity field increases suddenly after a vmware host failure
In case of vmware host failure, all the VMs including stopped VMs migrate
to the new host. For the Stopped Vms powerhost gets updated. This was
triggering HandlePowerStateReport which finally calls updatePowerState
updating update_time for the VM. This cause the capacity being reserved
for stopped VMs.

(cherry picked from commit 9d268c8cd5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-08-01 20:40:25 +02:00