Commit Graph

23752 Commits

Author SHA1 Message Date
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
Daan Hoogland 25876c6beb sign release branch instead of release tree 2014-11-21 03:40:52 +01:00
Syed 9f83a4d43b CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-20 09:46:55 -05:00
Daan Hoogland 892ba6ea80 update debian package changelog on version upgrade 2014-11-20 15:14:34 +01:00
Rajani Karuturi 82d74daf65 Fixed CLOUDSTACK-7937 CloudStack accepts unauthenticated LDAP binds
added validation checks for empty username and password and debug logs
when that happens.

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-20 12:10:15 +01:00
Rohit Yadav 73c62837b5 schema: Add upgrade paths from 4.3.2 to 4.4.0
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 14:11:25 +05:30
Anshul Gangwar 5b620951a3 CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-19 12:03:30 +01:00
Daan Hoogland f18d6238b0 empty schema upgrade ddl 2014-11-17 14:34:53 +01:00
Milamber f6551b4682 update Transifex config file 2014-11-15 08:55:01 +00:00
Milamber 87b1aa2c93 Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex 2014-11-15 08:55:01 +00:00
Daan Hoogland 5578616143 4.4.2 upgrade schema 2014-11-13 20:01:35 +01:00
Will Stevens 9c0c4f713f CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
(cherry picked from commit 92d4a41a69)

Conflicts:
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/root_chain.crt
	server/test/resources/certs/root_chain.key
	server/test/resources/certs/rsa_ca_signed2.crt
2014-11-13 16:50:51 +01:00
Pierre-Luc Dion 9cbd36515c CLOUDSTACK-7887: change int to str into swiftxen 2014-11-12 19:18:37 -05:00
Daan Hoogland a2a82f517b CLOUDSTACK-3383 escaped "'s 2014-11-11 22:15:35 +01:00
Wido den Hollander ee8facd382 CLOUDSTACK-3383: Fetch CPU utilization more reliable.
This should fix that we can't gather CPU statistics on hypervisors
> Ubuntu 12.04
2014-11-11 21:48:50 +01:00
Daan Hoogland 713a3590b6 Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-7883' into 4.4 2014-11-11 17:15:50 +01:00
Mike Tutkowski c58546158e CLOUDSTACK-7883: Allow infrastructure to handle delete of volume from DB 2014-11-11 08:59:06 -07:00
Daan Hoogland 3799558372 whitespace fixes 2014-11-11 16:51:15 +01:00
Jessica Wang 479b550d79 CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field (dependsOn property specified) - fix a bug that default opton in dependent dropdown field didn't trigger change event handler until another option in dependent dropdown field was selected.
(cherry picked from commit 21f39577e4)
2014-11-11 16:43:10 +01:00
Daan Hoogland 70cfbd3bb2 CLOUDSTACK-7246: corrected script name of createIpAlias.sh 2014-11-11 16:35:07 +01:00
Jayapal f1a714c022 CLOUDSTACK-7246: corrected script name of createipalias
(cherry picked from commit 1bfb1f6503)
2014-11-11 16:07:42 +01:00
Jayapal 987131fa90 CLOUDSTACK-7246: corrected script name of createipalias
(cherry picked from commit 912dc15bc1)

Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
2014-11-11 16:07:17 +01:00
Daan Hoogland b431cd5e09 Logrotate is called from crontab.
Debian crontab does not include everything in it's path.
 Therefore reference to these bins

 conflict leftovers from 380ecf2253
2014-11-11 15:56:09 +01:00
Daan Hoogland 8de7f84ad5 reenable tests for certs as far as working 2014-11-11 15:47:35 +01:00
Rohit Yadav 5e57eeefd9 CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updatse entries
invm_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>
(cherry picked from commit 97fa4a023e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-11-10 17:59:54 +05:30
Frank Zhang 1d92eebbe5 fix expried certificate in unit test
(cherry picked from commit 88561e154f)
2014-11-10 10:21:15 +01:00
Joris van Lieshout 380ecf2253 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:10:50 +01:00