Commit Graph

23778 Commits

Author SHA1 Message Date
Mihaela Stoica 5cce048f24 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-12-11 20:36:17 +05:30
Daniel Vega e4bf957f94 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-12-11 20:36:17 +05:30
Koushik Das 2320f5e91b 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

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
2014-12-11 20:36:11 +05:30
Jayapal c6ef739e25 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

Conflicts:
	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
2014-12-11 20:35:30 +05:30
Min Chen a2a7e391b0 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-12-11 20:33:20 +05:30
Damodar ac371070b4 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-12-11 20:33:20 +05:30
Rohit Yadav ab64ff1066 appliance: move built zip files to dist/
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	tools/appliance/build.sh
2014-12-11 20:32:36 +05:30
Daniel Vega 07172c8a99 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

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2014-12-11 20:29:08 +05:30
Edison Su 3006f5cc83 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-12-11 20:28:15 +05:30
Rohit Yadav 404a5e757c travis: run jetty using IPv4 stack only
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:19:22 +05:30
Min Chen f9ae3bbc98 CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
all the tags of all resources.

(cherry picked from commit 5fa7801b20)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:19:22 +05:30
Rohit Yadav 7a8ac87907 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a18d067278)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
2014-12-11 20:03:28 +05:30
Rohit Yadav 832fd7232c CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updates entries in
vm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-12-11 20:02:09 +05:30
Rohit Yadav 99261fb112 systemvmappliance: upgrade debian iso, openswan crashes with old kernel
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:58:35 +05:30
Rohit Yadav 90a9e9a809 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>
(cherry picked from commit 88acc9bd53)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:58:35 +05:30
Kishan Kavala 8b787850cf CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead
(cherry picked from commit 63109a97b1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java

Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
2014-12-11 19:58:23 +05:30
Murali Reddy fe9bcd1123 CLOUDSTACK-7679: bump up the RabbitMQ AMQP java client version from
2.8.7 to 3.3.5

3.3.5 is the latest stable version of AMQP client, which is also
backward comaptible. Successfully tested with updated client library.

(cherry picked from commit ff797dfa59)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:58:03 +05:30
Harikrishna Patnala ccc8c33896 CLOUDSTACK-7658: Upgrading debian packages as part of system vm template build
Signed-off-by: Jayapal <jayapal@apache.org>
2014-12-11 19:57:16 +05:30
Rohit Yadav f67d440844 debian: fix 4.3.2-snapshot deb build
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:56:46 +05:30
Wei Zhou 4a7532ee65 CLOUDSTACK-2823: pass cmdline info to system vms for 30 times
(cherry picked from commit 4eedfe53fc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	systemvm/patches/debian/config/etc/init.d/cloud-early-config
2014-12-11 13:14:01 +05:30
Rohit Yadav 3b286d77ca CLOUDSTACK-8014: Fix NPE searching including removed templates
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 19:27:20 +05:30
Rohit Yadav 5bc2d06c40 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)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-10 18:22:27 +05:30
Remi Bergsma 47754a68ac 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 10:54:44 +01:00
Remi Bergsma 03bf241e3e 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 10:54:32 +01:00
Remi Bergsma 0d7087a85a 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 10:54:15 +01:00
Remi Bergsma af4d1a635f 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 10:50:31 +01:00
Remi Bergsma 72aa05ab8e renamed $leftgw to $leftnexthop to make clear what it does
(cherry picked from commit 8b2563a216)
2014-12-09 10:50:17 +01:00
Remi Bergsma 2df7eb5ba3 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 10:50:04 +01:00
Rohit Yadav 79f8d6f5cf 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:56:30 +05:30
Daan Hoogland 3c4f776ffa minimal version for router vms is 4.4.1 in branch 4.4 2014-12-08 14:52:15 +01:00
Sudhansu c8882b39ec 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 16:34:50 +05:30
Rohit Yadav 2803cac06b 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-12-02 20:16:45 +05:30
Koushik Das 291a34aac1 CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-02 15:48:44 +05:30
Sateesh Chodapuneedi 8b4b51b054 CLOUDSTACK-7360 [vmware] Add host to existing cluster fails if the cluster is using Nexus 1000v as backend for atleast one traffic type.
While adding host to existing cluster which is using Nexus 1000v as a network backend, skip validation of Nexus VSM as it was already done while adding that cluster.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit a1d0925f90)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 17:51:56 +05:30
Koushik Das c44262bfc2 CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required

(cherry picked from commit a6ee4112a5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 17:50:32 +05:30
Anthony Xu afd7996776 CLOUDSTACK-5834: got VBD statistics from RRD
(cherry picked from commit 4e33d359a8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2014-12-01 17:34:16 +05:30
Rohit Yadav d1f008e2f2 CLOUDSTACK-7903: Fix build regression from previous fix
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 16:46:56 +05:30
Ilia Shakitko 342b73d37a CLOUDSTACK-7903: Decreased minimal usage aggregation range value
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 15:56:46 +05:30
Pierre-Luc Dion 62b9ae1fc4 Populate 4.4.1 and 4.4.2 changes 2014-11-30 21:18:24 -05:00
Pierre-Luc Dion 8b94aa2933 jira-changes.py: generate content for CHANGES.md from jira filter 2014-11-30 21:18:15 -05:00
Daan Hoogland 9b76342a23 upgrade path(s) 2014-11-28 23:50:30 +01:00
Hiroki Ohashi d15033675b CLOUDSTACK-7412: Can't create proper template from VM on S3 secondary storage environment
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-27 17:05:12 +05:30
David Bierce 9d7624f6ac 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: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:56:47 +05:30
Rohit Yadav 207d4653fa 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>
(cherry picked from commit bb81082e58)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 3fe1f732d7)
2014-11-25 21:31:10 +01:00
Keiichi Yusa bb36ef248f CLOUDSTACK-7951
Limit amount of memory used by cloudstack-agent jsvc.

Signed-off-by: Edison Su <sudison@gmail.com>
(cherry picked from commit 1d6ca5eacb)
2014-11-25 21:30:20 +01:00
Daan Hoogland 7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-25 15:36:02 +01:00
Daan Hoogland 46ece087ee Merge remote-tracking branch 'origin/4.4-RC20141121T0341' into 4.4 2014-11-25 15:30:26 +01:00
Likitha Shetty 54ebbe55a7 CLOUDSTACK-7415. Host remains in Alert after vCenter restart.
Management server PingTask should update PingMap entry for an agent only if it is already present in the Management Server's PingMap.

(cherry picked from commit 8ce6eba549)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 59ce63918e)
2014-11-21 14:42:17 +01:00
Sujaya Maiyya 5b549fd869 fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.
(cherry picked from commit e07d0ddabf)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java

(cherry picked from commit 5563a7314e)

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
2014-11-21 14:40:04 +01:00
Daan Hoogland e0420a6fec Updating pom.xml version numbers for release 4.4.2
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-21 03:41:26 +01:00