Commit Graph

22510 Commits

Author SHA1 Message Date
Kishan Kavala 7b7eb48281 CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
(cherry picked from commit 26746feb39)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:17:58 +05:30
Tanner Danzey 5ac44896c8 CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting
modified:   server/src/com/cloud/api/ApiDBUtils.java

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 601827e6b3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:17:09 +05:30
jeff af79d6aaf7 CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.

(cherry picked from commit 9c4de764f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java
2014-11-25 23:16:01 +05:30
Amogh Vasekar 7e5c7d488a CLOUDSTACK-6516: In 4.3, SSL was turned off by default.
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
(cherry picked from commit 05802004e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:12:59 +05:30
Jayapal fac57a0a83 CLOUDSTACK-6577: Disable service monitoring in RVR
(cherry picked from commit b9b623bccc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-11-25 23:10:27 +05:30
Jayapal dddc6488d4 CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
(cherry picked from commit 40836344de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
2014-11-25 23:08:44 +05:30
Marcus Sorensen 6ad3ae78e4 add conntrackd logrotate for systemvms, dont start conntrackd on logrotate if it isnt running
(cherry picked from commit df4a21ae3d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 23:02:52 +05:30
Jayapal cd77e702cf CLOUDSTACK-6714: monitor script echo service command is added with quotes
(cherry picked from commit 6052a181dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:55:18 +05:30
Wido den Hollander df7be28266 CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool
In situations where libvirt lost the storage pool the KVM Agent will re-create the
storage pool in libvirt.

This could be then libvirt is restarted for example.

The object returned internally was missing essential information like the sourceDir
aka the Ceph pool, the monitor IPs, cephx information and such.

In this case the first operation on this newly created pool would fail. All operations
afterwards would succeed.

(cherry picked from commit 48899e4c81)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:53:53 +05:30
Harikrishna Patnala 8992e18836 CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance
(cherry picked from commit 522208dec2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-11-25 22:50:03 +05:30
Sheng Yang bad40a7481 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.

(cherry picked from commit c181485ae5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:45:58 +05:30
Sheng Yang 7f1dd86443 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.

(cherry picked from commit 75c9a20c77)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:42:55 +05:30
Sateesh Chodapuneedi 96e14f309e CLOUDSTACK-6996 Adding cluster to legacy zone failed
Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

(cherry picked from commit 71f76edf71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
2014-11-25 22:42:13 +05:30
Murali Reddy 30dd76fc65 CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared
networks

fix ensures only admin users can delete shared network

(cherry picked from commit 2f293f42d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 22:36:55 +05:30
Rohit Yadav f72eb94554 CHANGES: update list of backported bugfixes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 20:34:11 +05:30
Murali Reddy b8a28dfae3 CLOUDSTACK-7144: No GSLB provider is available during assigning load
balancing rule

this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.

(cherry picked from commit 9dc322d46f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
	server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
2014-11-25 19:50:37 +05:30
Murali Reddy 816eb63e97 CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of
cleanup the rules then destroy

fix adds a provision to specify if cleanup is needed on network on
shutdown. VR is marked as to not to require network rules clean up on
network shutdown as the VR is destroyed and recreated.

ran the simulator tests that test network life cycle

(cherry picked from commit 67876b215e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:46:40 +05:30
Mihaela Stoica eb6987c393 CLOUDSTACK-7293: UI: Fixed localization issues on the login page
- Reverted the validator.messages to the original values (jquery.validator.js).
- Added a function to localize validator.messages which is called before login.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
(cherry picked from commit f212aa57c3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/cloudStack.js
2014-11-25 19:36:08 +05:30
Mihaela Stoica fa300f9f5e CLOUDSTACK-7302: UI: Remove Hover Interaction from breadcrumbs at top page
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
(cherry picked from commit af37743045)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:34:39 +05:30
Joris van Lieshout 7dbafba52f CLOUDSTACK-7319: dd with direct io is less impacting on Dom0 kernel resources
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit c4b78c3aaa)
(cherry picked from commit 37baddd721)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:33:34 +05:30
Gabor Apati-Nagy 898b2e700e CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c200ada863)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/accounts.js
2014-11-25 19:29:47 +05:30
Rohit Yadav dc80b25361 CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls
Fix is to fail API calls with empty 'id' parameter value upfront rather than
going ahead and failing with NPE later on.

Backported using fix 4e07dd1dc4 by
Koushik Das <koushik@apache.org>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:24:29 +05:30
Min Chen 0610bf670c CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after
management server restarts.

(cherry picked from commit 7cdb67dcf1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:22:33 +05:30
Rohit Yadav 33761a311b CLOUDSTACK-7679: Bump rabbitmq client library to latest 3.4.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6ad2f38426)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:18:45 +05:30
Min Chen 1cc58b1a6f CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a failed
operation.

(cherry picked from commit 1e20600eca)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 19:13:50 +05:30
Gabor Apati-Nagy ca8ecc0470 CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules
(cherry picked from commit 94b16b3bd5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:42:56 +05:30
Mihaela Stoica 0b317ea06d CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to fit the CIDR value without ellipsizing
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 6490694231)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:34:18 +05:30
Daniel Vega c6e2166876 CLOUDSTACK-7849: Sorting projects alphabetically in drop down menu
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit e03a7e6fea)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:33:32 +05:30
Koushik Das f0a81edb5b CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
(cherry picked from commit 8378485e56)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
2014-11-25 18:31:37 +05:30
Jayapal 1e475892d5 CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
(cherry picked from commit 709bf074de)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
2014-11-25 18:28:20 +05:30
Damodar 23a03ac1b0 CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks.
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 7e6ec2ce82)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2014-11-25 18:24:33 +05:30
Min Chen 04acc79b2d CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after some restart.
(cherry picked from commit 2ef06e754b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:21:12 +05:30
Damodar 12d1c945f2 CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 50a3c0b2e3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:11:22 +05:30
Rohit Yadav bb81082e58 CLOUDSTACK-7951: Limit amount of memory used by cloudstack-agent jsvc
The -Xms value specifies the minimum heap size the JVM should start with and
-Xmx is the maximum heap size it can grow. The previous fix imposed minimum
limit of 1G which is unreasonably for small deployments. The fix is to start
with 256MB and limit to 2G for cloudstack-agent process. This was tested on
DevCloud/KVM and then again on a ACS/KVM deployment on real hardware.

With these values, it's possible for the agent to work in a DevCloud/KVM
environment and if JVM needs it can increase the heap size to 2G. The fix also
ports these settings to Debian cloud-agent init.d script as well.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 18:03:53 +05:30
Keiichi Yusa 20de43fd79 CLOUDSTACK-7951
Limit amount of memory used by cloudstack-agent jsvc.

Signed-off-by: Edison Su <sudison@gmail.com>
(cherry picked from commit 7884c750a2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 17:45:59 +05:30
Rohit Yadav 712f8054d5 appliance: move built zip files to dist/
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 17:26:06 +05:30
Rohit Yadav 864e5ab2fc appliance: zip systemvm template for hyperv
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 17:24:00 +05:30
Daniel Vega 1f21c29855 CLOUDSTACK-7915: Remove hard-coded values for Load Balancer algorithms in UI
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit ba6dfd8470)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/WEB-INF/classes/resources/messages_fr_FR.properties
	client/WEB-INF/classes/resources/messages_ja_JP.properties
	client/WEB-INF/classes/resources/messages_ko_KR.properties
	client/WEB-INF/classes/resources/messages_nl_NL.properties
	client/WEB-INF/classes/resources/messages_zh_CN.properties
	ui/dictionary.jsp
2014-11-25 17:12:49 +05:30
Daniel Vega c2f367982e CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2014-11-25 14:19:16 +05:30
Edison Su a62fa62fc6 CLOUDSTACK-7966:
remove snapshot_store_ref entry, in which role is Primary, during
storage GC

(cherry picked from commit 7175247c5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 14:14:31 +05:30
Rohit Yadav 6d31aca25c CLOUDSTACK-6075: Increase the ram size for router service offering
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 14:08:25 +05:30
Kelven Yang 2aa9bb6896 CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin
(cherry picked from commit 09ec127470)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
	framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
2014-11-25 00:03:40 +05:30
Rohit Yadav 15ded4fdda CHANGES: add backported commits on 4.3 branch since 4.3.1 release
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:54:18 +05:30
Mike Tutkowski a165309b89 Allow infrastructure to handle delete of volume from DB
(cherry picked from commit 6602ad71ac97fb1875131f41bb5f92ff1e3a1c7b)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:05 +05:30
Rohit Yadav 11d446a0d8 Fix build failure from cherry-picked commits
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:04 +05:30
Olivier Lemasle ed90e0c751 CLOUDSTACK-6669: Fix support resize in usage server
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 303e6ffc1e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/parser/VolumeUsageParser.java
2014-11-24 23:47:04 +05:30
Rajani Karuturi 06a664b063 FIXED CLOUDSTACK-6669 Support volume resize in usage server
(cherry picked from commit bdde5335f9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/UsageManagerImpl.java
2014-11-24 23:47:04 +05:30
Harikrishna Patnala 90c92ff17d CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
(cherry picked from commit 14f1b96b51)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:03 +05:30
Kelven Yang 839ef94ce9 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception
(cherry picked from commit 06d8d3a03f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:03 +05:30
Kelven Yang b716444b84 Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server.
(cherry picked from commit 521ac796dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
2014-11-24 21:13:14 +05:30