Commit Graph

23805 Commits

Author SHA1 Message Date
Daan Hoogland 02feb0180a CLOUDSTACK-8073 load cidrs on create response 2014-12-15 15:58:42 +01:00
Rohit Yadav 2f2ff4bfc0 engine: Fix build regression
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 21:49:11 +05:30
Rohit Yadav 94cad49e07 CLOUDSTACK-8070: during 4.4.2 to 4.4.3 upgrade encrypt config that are hidden
In case there is an encryption key/password is provided the value, specifically
for router.ram.size will be encrypted otherwise it will remain plain text.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 20:43:53 +05:30
Joris van Lieshout 28ff60e74a volume /usr was sized to small and ends up being 100% full on SSVMs and CVMs. By juggling some partman-auto numbers the space gets devided more evenly. After this patch /usr should be around 80% full. I've also reduced the swap space because this makes no sense on virtual instances.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-12-12 11:37:16 +01:00
Wei Zhou 10248515d7 CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
(cherry picked from commit c9d492d714)
2014-12-12 11:15:44 +01:00
Rohit Yadav 010a217ead ldap: fix redundant import
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 22:18:59 +05:30
Rohit Yadav 030a1c5edd CHANGES: update list of bugs fixed on 4.4 since 4.4.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 22:18:55 +05:30
Rohit Yadav 1971b432c3 Revert "CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules"
This breaks validations such as ingress/egress rules on Security Group on the
UI so reverting this.

This reverts commit ca8ecc0470.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 21:59:14 +05:30
Saksham Srivastava 2e76d318ae CLOUDSTACK-7950: AttachIsoCmd shoud give correct messge when trying to attach vmwaretools installer iso on non supported guestvm deployed by ISO
(cherry picked from commit 4ff3130bec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 21:59:14 +05:30
Edison Su 40bc5df0b1 CLOUDSTACK-5446:
delete all the leftover snapshots on primary storage in case of snapshot
errors, after a new backup snapshot is finished

(cherry picked from commit 2667855ccb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:52:06 +05:30
Jessica Wang 5e5d830635 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.
(cherry picked from commit e796d418b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/network.js

Conflicts:
	ui/scripts/network.js
2014-12-11 20:51:56 +05:30
Jessica Wang 7da55df56b CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical Network dropdown is changed, refresh Network Offering dropdown (because each physical network has its own tags which maps to different network offerings)
(cherry picked from commit 0af0c041e9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:51:33 +05:30
Rajesh Battala 73895a5bb6 CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
(cherry picked from commit 7ac48934f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:51:18 +05:30
sanjeev 1b135af814 CLOUDSTACK-6172: Adding new test case to verify this fix
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:48:14 +05:30
Rajani Karuturi e3a1288763 CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
(cherry picked from commit 4552ec6322)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
2014-12-11 20:48:07 +05:30
Min Chen 2de93881c7 CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
(cherry picked from commit 672bb353be)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 20:48:06 +05:30
Min Chen 38bc20e67f CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql
(cherry picked from commit cd8af6a3e2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
2014-12-11 20:47:57 +05:30
jeff e9d079ace1 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

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java
2014-12-11 20:45:40 +05:30
Murali Reddy 6455a69a4b 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

Conflicts:
	server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
	server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
2014-12-11 20:40:13 +05:30
Murali Reddy 908ee8e01a 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-12-11 20:39:33 +05:30
Mihaela Stoica 614ce7de96 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

Conflicts:
	ui/scripts/cloudStack.js
2014-12-11 20:39:12 +05:30
Mihaela Stoica b0e5a303d9 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-12-11 20:38:52 +05:30
Gabor Apati-Nagy 23b3198233 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

Conflicts:
	ui/scripts/accounts.js
2014-12-11 20:38:19 +05:30
Min Chen 9bd2749a63 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-12-11 20:36:18 +05:30
Rohit Yadav e850e8e58f 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-12-11 20:36:18 +05:30
Min Chen e9311bf528 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-12-11 20:36:18 +05:30
Gabor Apati-Nagy 227e76132d 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-12-11 20:36:17 +05:30
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