Commit Graph

1237 Commits

Author SHA1 Message Date
Marcus Sorensen e5741863f7 Summary: Quiet erroneous stopVM failures on kvm
Detail: Cloudstack tries to stop VMs all the time, for all sorts of reasons,
but usually just to get into a known state.  Libvirt throws an exception of
'Domain not found' when attempting to stop a VM that doesn't exist. This causes
problems for troubleshooting real issues. Domain not found should equate
to success if trying to stop.

BUG-ID: CLOUDSTACK-4011
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375825281 -0600
2013-08-06 15:46:36 -06:00
Edison Su aebc437476 fix simulator 2013-08-06 13:32:59 -07:00
Wei Zhou 5cb090ed40 CLOUDSTACK-2729: move unlock to finally block to handle failed libvirt operations 2013-08-06 12:40:06 +02:00
Edison Su 36c7a56d12 CLOUDSTACK-4073: fix s3 on vmware
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
2013-08-05 20:23:01 -07:00
Wei Zhou 1e4ff7f453 CLOUDSTACK-2729: use file lock to prevent concurrent refreshPool/deleteVolume on KVM shared storage pool
Signed-off-by: Edison Su <sudison@gmail.com>
2013-08-05 11:24:03 -07:00
frank 84ed1fee6b CloudStack CLOUDSTACK-3307
UCS:DB: Same UCS manager can be added multiple times
2013-08-05 11:10:54 -07:00
Wido den Hollander 52099e42b8 rbd: Move some logic from LibvirtComputingResource into KVMStorageProcessor
All this logic was in LibvirtComputingResource but seems redundant. Move it
into the KVMStorageProcessor
2013-08-05 17:34:13 +02:00
Murali Reddy ea5be13761 CLOUDSTACK-4048:[GSLB] Failed to assign more than one LB rule to a GSLB rule that is
created with gslbmethod=leastconn

Netscaler nitro api to add gslb virtual servers fails for some reason if
both netmask and round robin methods are specified. So working around
with settign netmask to be null while updating vserver.
2013-08-05 19:36:25 +05:30
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Wido den Hollander 3fb58c42c4 CLOUDSTACK-4004: Fix attaching a newly allocated RBD image to an Instance
Signed-off-by: Wido den Hollander <wido@42on.com>
2013-08-02 13:19:12 +02:00
JijunLiu 2903bb5fd9 Add cpu model for kvm guest.Now all the kvm guest's cpu model is 'QEMU Virtual CPU version xxx'. This will affect the activation of Windows OS and low performance. I add three mode for user to indicate the guest cpu model.add libvirt version check
Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-08-02 11:56:59 +02:00
Ian Duffy 25e8e9b85f General cleanup, source formatting, remove whitespace
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 14:20:47 +05:30
Ian Duffy 00c17add3c Add SSL Support
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 14:20:47 +05:30
Ian Duffy 23f0187d05 Add Support for member of filter
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 14:20:47 +05:30
Ian Duffy 532e04db1a Disable password changing when ldap is enabled
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 14:20:47 +05:30
Anthony Xu 7bf37c1202 CLOUDSTACK-4017:
try to remove VDI host lock before start the VM which is using this VDI
2013-08-01 15:33:42 -07:00
frank 5ed3749cd9 CloudStack CLOUDSTACK-3986
baremetal - create basic zone for baremetal fail - Dhcp service provider for this network does not support the dhcp across multiple subnets
2013-08-01 14:56:33 -07:00
Edison Su 3a928d7db0 CLOUDSTACK-4008: return virtual size of volume in KVM 2013-08-01 13:25:49 -07:00
Sanjay Tripathi ec9a797b4c CLOUDSTACK-4001: Unable to deploy Windows server 2012 64 bit VM on xenserver 6.2
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-01 21:04:52 +05:30
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
John Burwell e25f185e64 - CLOUDSTACK-3229: Attempt to adjust snapshot source path to new cache
filesystem layout
2013-08-01 03:55:17 -04:00
John Burwell 6ec9a44429 - CLOUDSTACK-3229: Works around Introspector bug that does not recognize
Boolean typed accessor methods by manualy populating the https value.
A generic implementation will be investigated when time permits.
2013-08-01 01:54:54 -04:00
John Burwell e2bcbe90c0 - CLOUDSTACK-3229: Fixes a think-o in the handling of unmodifiable
collections and adds a rail in s3xen to raise an exception if the file being
put does not exist
2013-08-01 00:14:57 -04:00
John Burwell 1ae682de78 - CLOUDSTACK-3229: Properly serialize the https property to the s3Xen
plugin
  - Extracts the duplicated serializeProperties methods to
    ReflectUtils#flattenProperties
  - Adds unit tests for ReflectUtils#flattenProperties
2013-08-01 00:14:43 -04:00
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Min Chen f23c7d21a1 CLOUDSTACK-3987: Setting extract.url.expiration.interval is not honored
for S3 generated url, which is hard-coded to 1 hour.
2013-07-31 16:30:46 -07:00
Murali Reddy 5695db80ac CLOUDSTACK-3731: [GSLB] deleteGlobalLoadBalancerRule fails with the
java.lang.NumberFormatException

While deleting LB monitor and GSLB service binding Nitro API fails
with wierd NumberFormatException. Adding a workaround to delete the LB
monitor after GSLB service is delted (which ensures intenrally LB
monitor is delted).
2013-08-01 04:51:24 +05:30
Wido den Hollander b611394cca rbd: Enable snapshotting of RBD images
Signed-off-by: Wido den Hollander <wido@42on.com>
2013-08-01 01:12:42 +02:00
John Burwell ceed152426 - CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen
plugin
2013-07-31 09:58:22 -04:00
Rajesh Battala 2cca335856 CLOUDSTACK-3924 NPE while internal LB vm is getting created
Issue:
======
Unable to created internalLB Vm. this is due while determining maxconn
value from networkoffering.
to find the networking offering, networkid is passed instead of
networkoffering id which is causing the issue.

fixed:
=====
fixed the issue by passing the network offering id instead of network
id.

Conflicts:
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
2013-07-31 10:53:02 +05:30
Marcus Sorensen ac59a4f136 Summary: Move Xen vmdata to new, non-ssh method
Detail: KVM recently got a patch that did away with a few dozen ssh calls
when programming virtual router (CLOUDSTACK-3163), saving several seconds
for each vm served by the virtual router when the router is rebooted. This
patch updates Xen to use the same method, and cleans up the old script refs.

Reviewed-by: Sheng Yang, Prasanna Santhanam
2013-07-30 21:45:36 -06:00
Toshiaki Hatano 7774ecfd5a CLOUDSTACK-3959: [KVM] agent setup failed when physical interface name is in pXpY format
Add handling.

Signed-off-by: Edison Su <sudison@gmail.com>
2013-07-30 16:17:12 -07:00
Edison Su 211524f3bc add note on vmwarweguru->getCommandHostDelegation 2013-07-30 16:17:06 -07:00
Edison Su c42f51d75b CLOUDSTACK-3944: fix regression for vmware 2013-07-30 16:17:02 -07:00
Koushik Das 62a71e055b CLOUDSTACK-3937: Attaching uploaded volume is failing
The method getCommandHostDelegation(long hostId, Command cmid) got overidden in VmwareGuru.java as part of
commit bfe30cd2e3. Earlier there was no HV specific implementation and copy
volume from secondary to primary worked fine. With the Vmware specific change the code was getting hit even
in case of XS and other hypervisors and failed with NPE.
Now there is a check in the Vmware implementation to check if the HV is of type Vmware.
2013-07-30 16:56:15 +05:30
Edison Su f0f55226de CLOUDSTACK-3107: fix attach upload volume 2013-07-29 19:00:16 -07:00
Edison Su f486d36f88 CLOUDSTACK-3908: fix extract path 2013-07-29 16:58:51 -07:00
frank 2d5f24ceb1 CLOUDSTACK-3918
com.cloud.ucs.manager.UcsManagerImpl cannot parse default config
2013-07-29 15:30:09 -07:00
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
2013-07-29 11:50:16 -07:00
Devdeep Singh d06a5bc5f0 CLOUDSTACK-3890. Delting the storage pool is not getting from xenserver. The
storage pool entry was removed from the db but the pool wasn't unmounted from
the host. There was a check that if the pool is not in UP state then the entry
can just be removed. That is wrong. A pool can only be removed if it is in
maintenance state. So after putting the pool in maintenance state if admin
tries to delete the pool we just remove the db entry without un-mounting the
storage pool from the host. Removed the incorrect check.
2013-07-29 17:26:55 +05:30
Kishan Kavala 9fe5d398a2 CLOUDSTACK-3849: Set volume size in CopyAnswer for Vmware when cloning volume from bas template 2013-07-29 16:34:46 +05:30
Ian Duffy ec064b3077 New LDAP UI
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2013-07-29 05:58:00 -04:00
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Harikrishna Patnala 8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
Sateesh Chodapuneedi 57d96308c1 CLOUDSTACK-3468 Failed to Deploy Instances with multiple VMWARE clusters when DVS is enabled at the Zone level
Fixing cluster level override of zone level specified vSwitch settings.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-29 03:04:23 +05:30
Prasanna Santhanam 2c660cdbc2 Fix simulator and marvin
- Remove additional parantheses in marvin VirtualMachine.create(
- Implement createEntityExtractUrl command for simulator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 908df7aabd)
2013-07-28 10:21:34 +05:30
Sateesh Chodapuneedi 3adeb12d2f CLOUDSTACK-3879 [VMware] NPE while attempting to create template from volume
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-27 18:03:17 +05:30
Sateesh Chodapuneedi 081ba92497 COUDSTACK-3053 Template creation from snapshot is failing on VMware setup
Fixed snapshot vmdk file path while copying snapshot files to template path.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-27 18:02:31 +05:30
Alex Huang 3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Alex Huang c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -07:00
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
frank 697b7c9471 make UCS api name better 2013-07-26 11:28:47 -07:00
Sanjay Tripathi 5b46e93d28 CLOUDSTACK-3544: Xen 6.2 hosts are tagged with Xen 6.1.
This commit will add the new xenserverresource file to support XenServer 6.2.
Also add the guest OS list supported by xenserver 6.2
2013-07-26 16:00:40 +05:30
Devdeep Singh c0ea76a77e CLOUDSTACK-3501. Cannot create instances on XenServer with multiple cores in a socket. If
details has information on cores per socket, create an instance accordingly. The vm record
is populated with information on how many cores should be allowed in a socket.
2013-07-26 15:10:43 +05:30
Devdeep Singh 62c8df9dcd CLOUDSTACK-3590. Adding new xenserver host to cluster fails in first attempt. While adding
a host to the pool it may take a little longer to join the pool. Increased the time the
resource waits and checks to make sure the host has joined as slave to the pool.
2013-07-26 11:01:29 +05:30
Alex Huang 111febc567 Fixed up the rest of the management server code that calls clustermanager 2013-07-25 19:57:45 -07:00
frank 42738c2fda change associatesUcsProfileToBlade to async api 2013-07-25 15:26:51 -07:00
Min Chen e7cdaa1b31 CLOUDSTACK-3667:[Object_Store_Refactor][VMWare] System VMs StartCommand
failed due to Exception: java.lang.Exception Message: secondary storage
for dc 3 is not ready yet?
2013-07-25 10:57:05 -07:00
Ian Duffy eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Jayapal 0984594323 CLOUDSTACK-2933 Added vpc load balancing changes for vmware 2013-07-25 17:40:48 +05:30
Prasanna Santhanam 2d5fde3dc1 Fix the simulator
Include the createTemplateFromSnapshot in the storageprocessor.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit e8383121c60e7c815ba1990df1e8a440f7d87188)
2013-07-25 14:14:49 +05:30
Edison Su 80ac885e22 CLOUDSTACK-2304: fix migrate volume for vmware 2013-07-24 19:06:42 -07:00
Edison Su 7f200d966e CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot 2013-07-24 19:06:30 -07:00
Min Chen 2f1d4dd0ba CLOUDSTACK-3665:KVM specific issue in create volume from snapshot. 2013-07-24 18:36:28 -07:00
Min Chen 13a9b94193 CLOUDSTACK-3665:Failed to create volume from snapshot. 2013-07-24 14:39:07 -07:00
Bharat Kumar e14f5d0aeb Cloudstack-3694 Dnsmasq rewrite in bash
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-07-24 14:00:31 -07:00
Amogh Vasekar a47faa9d28 Adding HTTPS support for UCS, refactored code for o.a.c.httpclient.contrib
CLOUDSTACK-3285
UCS: Need support for HTTP redirects and HTTPS Certificate handling
2013-07-24 13:55:23 -07:00
Edison Su d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su fa358cf01f CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:41 -07:00
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Koushik Das d1c8822893 CLOUDSTACK-3777: IndexOutOfBoundsException while adding Cisco VNMc provider on a upgraded setup
Isolation methods may not always be present for a physical network. So not using it while adding VNMC appliance
2013-07-24 17:37:46 +05:30
Alex Huang 9bc5870f01 Removed the remove method. Not sure why we added to VirtualMachineManager 2013-07-23 18:24:58 -07:00
Anthony Xu 089cbb610b when create local link netowrk fails for xenserver, adding host should fail 2013-07-23 15:19:05 -07:00
Alex Huang 5297a071d2 Changed virtual machine stop to use uuid 2013-07-22 20:06:04 -07:00
Alex Huang 319d91e1c2 Removed the getByTypeAndId() method and replace it with getById method 2013-07-22 20:06:04 -07:00
Alex Huang 6ac361e6a2 Removed VM generic from VirtualMachineGuru. Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms 2013-07-22 16:32:59 -07:00
Anthony Xu 668089d575 correct the log message 2013-07-22 15:56:11 -07:00
Amogh Vasekar 5ff83e9c31 Adding encryption flag
CLOUDSTACK-3308
UCS:DB: UCS Manager password should not get stored in plain text.
2013-07-22 15:45:17 -07:00
Alex Huang 1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Alex Huang 7928963d16 Changed start to use uuid instead of generic vm start 2013-07-22 11:46:33 -07:00
Wei Zhou d2c1ed4865 ui change: Disk I/O polling statistics 2013-07-22 16:06:10 +02:00
Mike Tutkowski 98dd501a81 Changes related to Review Board comments 2013-07-20 17:44:23 -06:00
frank 56fad86920 CLOUDSTACK-3428
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fix entityType in api command
2013-07-19 17:47:00 -07:00
frank 0633608f80 CLOUDSTACK-3453
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
2013-07-19 16:16:41 -07:00
Sanjay Tripathi 6e63f10a4f CLOUDSTACK-2510: Getting NPE while executinng listStoragePools API command. 2013-07-19 16:02:08 +05:30
Alex Huang 5af61a85ae Fixed build. Not sure why it didn't come up on my compile before the commit 2013-07-18 22:53:30 -07:00
Alex Huang b18c72626b Moved the SprintUtils which is for testing only to be in test directory. Changed pom.xml for different projects to use the utils test-jar. Removed some @Component annotations. Moved majority of the dependencies from cloudstack pom to utils pom 2013-07-18 21:53:51 -07:00
Mike Tutkowski b43a2a5fae Changes related to Review Board comments 2013-07-18 20:10:58 -06:00
frank 49e3278c42 CLOUDSTACK-3426
UCS: Session cookie refresh must be supported.

add missing plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsCookie.java
2013-07-18 16:43:21 -07:00
frank 9379190da9 CLOUDSTACK-3426
UCS: Session cookie refresh must be supported.

fixed resolved
2013-07-18 16:43:21 -07:00
frank d7781c3e37 CLOUDSTACK-3307
UCS:DB: Same UCS manager can be added multiple times

fixed resolved
2013-07-18 11:44:32 -07:00
frank ed6164fe00 CLOUDSTACK-3428
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fixed resolved
2013-07-18 11:44:32 -07:00
Sateesh Chodapuneedi 7e087645c6 CLOUDSTACK-3595 Backup snapshot successful but CopyCmdAnswer received is failure.
Send success answer of type CopyCmdAnswer with full snapshot backup path in secondary store (image store role)

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-18 23:29:54 +05:30
Harikrishna Patnala b4662af0a9 CLOUDSTACK-3551: scaling up VM to service offering with 2gbram
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-18 15:04:20 +05:30
Vijayendra Bhamidipati d6cb95208b CLOUDSTACK-3554: NPE while attaching VMWARE Tools ISO to the instance
Description:

    Account for null imagestore for vmware-tools iso.
2013-07-17 16:58:51 -07:00
Edison Su c618caf102 fix localendpoint npe 2013-07-17 16:29:52 -07:00
ahuang ee4d067c12 Fixed a bunch of asserts 2013-07-17 16:20:53 -07:00
ahuang 541f9d7f9c Changed allocate method to be virtual machine type agnostic 2013-07-17 15:58:46 -07:00
Sateesh Chodapuneedi 59788c1473 CLOUDSTACK-3530 Runtime exception while creating Snapshot from volume (ROOT/DATA)
Worker name is not being configured for CopyCommand.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-18 00:39:28 +05:30
Jayapal 2d6644d961 CLOUDSTACK-2433 Enable rps and rfs in virtual router 2013-07-17 16:59:59 +05:30
Bharat Kumar dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Edison Su bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Prachi Damle fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle 661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Kishan Kavala ea3a77e2af CLOUDSTACK-3484: Removed method synchornization in libvirt and virtual router resources 2013-07-16 19:14:31 +05:30
Hugo Trippaers af696e6ff6 CLOUDSTACK-728 Remove the nvp portgroup when the virtual machine is
expunged.
2013-07-16 15:42:29 +02:00
ahuang 17984a3f8c Removed the plug and unplug method from VMGuru. Why should VMGuru understand how to plug and unplug nics? Part of componentizing the vmsync work 2013-07-15 11:00:58 -07:00
Murali Reddy 467fa6117e CLOUDSTACK-2346: [GSLB] dedicated vs shared GSLB devices and LB devices
Only one NetScaler device can act as GSLB service provider in a zone for
all the tenants and thier networks, so restrict addign NetScaler device
to be shared use when configure as GSLB service provider.
2013-07-15 16:31:18 +05:30
Wei Zhou f89848b0db CLOUDSTACK-2823: move kernelVersion to global configuration in LibvirtComputingResource.java 2013-07-15 10:54:38 +02:00
Vijayendra Bhamidipati 1f004f60e8 CLOUDSTACK-3425 Ignore network interfaces without a uuid when passing
them on as extra configs to ESX for nicira NVP controller.
2013-07-15 10:17:36 +02:00
Toshiaki Hatano b134854937 CLOUDSTACK-3431: KVM: cloudstack-plugin-hypervisor-kvm with BridgeVifDriver doesn't cleanup vNet due to multiple reasons
- Move vnetBridge clean up function from LibvirtComputingResource to BridgeVifDriver
-- since only BridgeVifDriver have to handle this event
- LibvirtComputingResource now properly call VifDriver.unplug() when it receives UnPlugCommand

- Remove not working and no longer used method getVnet(String) from VirtualMachineName
- Remove not working and no longer used method getVnet() from StopCommand
- Remove unused constructer StopCommand(VirtualMachine, String, boolean) from StopCommand
- Remove unused member vnet from StopCommand
- Remove unused member _modifyVlanPath from OvsVifDriver

Tested with 2 KVM hosts and confirmed it correctly manipulate vnetBridge with start, stop, migrate, plug, and unplug event

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-07-15 09:12:52 +02:00
Mike Tutkowski 5bcb6ec9ca Changes related to Review Board comments 2013-07-13 23:43:48 -06:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su 0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Vijayendra Bhamidipati d9ce49b1f1 CLOUDSTACK-3264: [ZWPS]NPE while finding storage pools for migration
Description:

    Filter primary storage pools based on zonewide/clusterwide configuration
    when considering pools to list for storage migration of volumes.
2013-07-12 15:19:36 -07:00
Mike Tutkowski 505ab2eebe Changes related to Review Board comments
Changes related to Review Board comments

Changes related to Review Board comments
2013-07-12 14:28:00 -06:00
Hugo Trippaers 2691970f28 CLOUDSTACK-728 Get the framework in place the support the removal of the portgroup that is created for a nic connected to an lswitch.
Add a command to tell a hypervisor guru to take some action when
expunging a nic
2013-07-12 12:18:34 +02:00
Hugo Trippaers 7dc3d3bae5 Formatting changes using the settings from Alex 2013-07-12 12:18:20 +02:00
Hugo Trippaers 392bbcc737 CLOUDSTACK-728 Rewrite support for lswitch connected nics on both standard and distributed switches.
Fix the name of the interface id in extra config, so the nic is found up using the nic uuid instead of the vm id.

getVlanInfo should return null when the nic is plugged on a Lswitch network.

On a distributed portgroup all vms should be connected to a single
portgroup and set a specific vlan on the port. On a standard switch each nic should have its own portgroup with a dedicated vlan (not related to CS vlans)
2013-07-12 12:18:07 +02:00
Wei Zhou dc9f7290e8 CLOUDSTACK-2823: try passCmdLine some times if kernel < 2.6.34 and qemu < 1.1.0 on hypervisor (for instance, CentOS 6.4) 2013-07-12 09:48:40 +02:00
Amogh Vasekar 0331b8fe5d CLOUDSTACK-3234: Adding cookie to associate profile blade API
Signed-off by: Animesh Chaturvedi <animesh@apache.org>
2013-07-11 16:27:11 -07:00
Sateesh Chodapuneedi a3660d8109 CLOUDSTACK-3469 [VMware] Support to make username/password optional while adding VMware cluster
For legacy zones insist on the old model of asking for credentials for each cluster being added.
For non-legacy zones check if username & password are provided. If either or both not provided, try to retrieve & use the credentials from database, which are provided earlier while adding VMware DC to zone.
This lets user to not specify credentials while adding VMware cluster to zone, if the credentials are same as that of provided while adding VMware DC to zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-11 20:39:33 +05:30
Devdeep Singh 51b02702f9 CLOUDSTACK-3467: Fixing the unit tests for implicit dedication planner. When fix for bug 2662
was made the unit tests were not updated correctly. The unit tests should have been changed to
return the correct mock object (VMInstanceVO) when vmInstanceDao is queried for the vms
running on host.
2013-07-11 16:05:51 +05:30
Sateesh Chodapuneedi 1e2f99be68 Updated logger initalization in classes ListVmwareDcsCmd, RemoveVmwareDcCmd & minor cleanup of comments. 2013-07-11 15:59:25 +05:30
Vijayendra Bhamidipati 7ea8c5fd9a CLOUDSTACK-1510: NPE when primary storage is added with wrong path
Description:

	a) Fixing NPE when wrong path is provided for primary datastore.
	b) No error dialog shows up in GUI when wrong path is provided,
	   after NPE fix - propagating exception upward.
	c) If the KVM agent is down, an invalid datastore gets logged in
	   storage_pool table and doesn't get removed, so it shows up
	   in the GUI in the list of datastores - fixing this as well.
2013-07-10 14:55:57 -07:00
Edison Su 58f0007f75 turn on simulator code, only when -Psimulator is used 2013-07-10 14:31:47 -07:00
Sateesh Chodapuneedi 29a31708d5 CLOUDSTACK-3450 To implement toggle action of add/remove VMware DC, listVmwareDcs API call is required.
listVmwareDcs API is added. Takes 1 parameter (mandatory) which is zoneId.
Returns list of VMware DCs associated with specified zone.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-10 23:04:32 +05:30
Sateesh Chodapuneedi 664dc17b0b CLOUDSTACK-3303 Vmware - Put a mechanism to disable hot add vcpu if the number of cores per socket is not 1 and virtual machine hardware version=7
Following Hotadd memory checks are included now.
1) Check if guest operating system supports memory hotadd
2) Check if virtual machine is using hardware version 7 or later before enabling memory hotadd

Following Hotadd CPU checks are included now.
1) Check if guest operating system supports cpu hotadd
2) Check if virtual machine is using hardware version 8 or later.
3) Check if virtual machine has only 1 core per socket. If hardware version is 7, then only 1 core per socket is supported. Hot adding multi-core vcpus is not allowed if hardware version is 7.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-10 17:58:42 +05:30
Devdeep Singh 033d05fa20 CLOUDSTACK-3443: Timeoffset on windows guest not persisted between VM stop and start on XenServer.
The problem was because in cloudstack when a vm is stopped it gets destroyed on the host. For a
windows vm the timeoffset (which can be set by changing the timezone from within the vm) is stored
in the platform:timeoffset attribute of vm record. The information is lost when the vm is destroted.
Made change to read and persist the platform:timeoffset vm attribute when an instance is stopped.
The value is persisted in the user_vm_details table. When the vm is started again the attribute is
set for the vm instance that gets created.
2013-07-10 17:36:06 +05:30
Mike Tutkowski 06f73092fb Changes related to Review Board comments 2013-07-09 22:50:14 -06:00
Edison Su 5e13327339 fix simulator 2013-07-09 10:42:15 -07:00
Edison Su 94aa67eae0 fix simulator 2013-07-09 10:42:03 -07:00
Sateesh Chodapuneedi 91d31b29b8 CLOUDSTACK-3304 [Vmware][Dynamic Scaling] - Enforce checks for maximum hotadd memory limit & memory increment size in CS
Retrieve maximum hotadd memory limit & hotadd memory increment size from running VM's configuration to validate dynamic scale memory limit while scaling up a VM.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-08 21:17:49 +05:30
Sateesh Chodapuneedi 5f395e41ab CLOUDSTACK-2592 [Automation]: Scale up VM on VMWARE without license doesn't throw appropriate error
Now ESXi server license would be fetched to see if HOTPLUG feature is license or not.
Throw Exception if the feature is not licensed.

Also added FeatureKeyConstants enum type to maintain list of various features to be checked whether licensed or not.
2013-07-08 12:49:39 +05:30
Nitin Mehta bb6cd764c7 CLOUDSTACK-3267
Improved logging by logging the memory values when exception is thrown for the constraint
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-04 14:24:41 +05:30
Alex Huang 43ab9506ab Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation. 2013-07-03 17:48:53 -07:00
Harikrishna Patnala d2739cde2e Fix file name in DnsMasqConfigCommand
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 20:43:42 +05:30
Harikrishna Patnala 98c5fe3a8d CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 16:59:21 +05:30
Murali Reddy 2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Sateesh Chodapuneedi 6aa9b2f356 CLOUDSTACK-3152 addVmwareDc API call fails if called more than once to add same VMware DC to same cloudstack zone.
Check if the associated VMware DC matches the one specified in API params. This check would yield success as the association exists between same entities (zone and VMware DC)
This scenario would result in if the API addVmwareDc is called more than once with same parameters. For such scenario, return success response with VmwareDatacenter object read from database. Also returns success if addVmwareDC is called agsin with same zone and VMwareDC where the zone already has resources added to it (clusters etc.)

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-02 17:31:09 +05:30
Bharat Kumar 61bc6c8477 Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:50 +05:30
Bharat Kumar 160c8f361b Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of vmware, Cloudstack-3240 corrected a mistake in the script name.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:30 +05:30
Sheng Yang 2fc6054a9d Baremetal: Move list APIs to the correct location 2013-07-01 15:19:39 -07:00
Murali Reddy e07a8b3f51 CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule
-fixing regression due to adding GSLB monitor for GSLB service

-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
2013-07-01 19:07:00 +05:30
Sateesh Chodapuneedi f980341808 CLOUDSTACK-3279 Need mechanism to detect if hotadd for cpu/memory is supported per a specific guest OS supported by VMware.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-01 17:27:32 +05:30
Hugo Trippaers 40f38521c4 It makes more sense to print the task uuid than the task type in the trace message
Add retry counter to exiting pong command message

Some additional code cleanup courtesy eclipse save actions, thanks Alex
2013-06-30 12:10:59 +02:00
Sateesh Chodapuneedi e8ea6b1abd CLOUDSTACK-3260
Fixing NPE.
2013-06-30 08:59:41 +05:30
Prasanna Santhanam bd784fb8ec Include license header for solidfire util
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 16:55:55 +05:30
Edison Su 49ded7e4a3 the plugin better not touch database 2013-06-29 15:09:43 +05:30
Prasanna Santhanam 57641d85f7 Set all templates/volumes to Ready in the simulator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam 0dc5b0d29a Don't report back resource state to ResourceManagerImpl
on adding sec. storage no need to report back to resourceManager since
the sc. storage is no longer a directly connected host.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam fd867d5afa DataStore - provider, lifecycle, driver implementations for simulator
mock implementation to manage secondary storage related operations for
the simulator.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:52:16 +05:30
Prasanna Santhanam 085e8838e4 Fix typo in backupSnapshotCommand
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Prasanna Santhanam de38cd815f Fix typo in class name
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Sanjay Tripathi 1659ee225c CLOUDSTACK-3082: System VMs are failed to start with Xen 6.2.0( Failing to create VIF's) 2013-06-29 05:39:33 +05:30
Hugo Trippaers ed00427989 Improve logging for CitrixResourceBase by replacing e.printStackTrace
with s_Logger.error.

Automatic cleanup using the eclipse settings from Alex
2013-06-28 16:45:31 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Hiroaki KAWAI 2091852175 CLOUDSTACK-212: migrate the namespace (network-ssp-plugin)
migrate the ssp plugin namespace from com.cloud to org.apache.cloudstack

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-28 18:10:28 +09:00
Fang Wang 24499deb43 CLOUDSTACK-2384: Template created from snapshot error.
In DB, the backedUpSnapshotUuid format got changed.
This messed up the vmdk file path in template creation from snapshot
2013-06-27 17:34:32 -07:00
Sheng Yang 7e44f81273 UCS: Add missing beans
Also move the API to the right place
2013-06-27 14:54:45 -07:00
Hugo Trippaers 329c6eb4d3 Adding tracelogging to CitrixResourceBase xapi task handling.
Currently it is very hard to see which tasks are pending in cloudstack
that need to be executed by xapi. Ideally we would like to have a
central overview of all tasks centrally. But for now being able to
enable tracelogging should give some insight in what is going on.
2013-06-27 14:54:31 -07:00
Donal Lafferty 4361418e41 Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource".  Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call

Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00
Laszlo Hornyak 882e5fa4e0 FileUtil simplified
- writeToFile removed since no references to it
- readFileAsString replaced with FileUtils.readFileToString
- minor code duplication removed in dependent method getNicStats
- unit test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-27 11:08:03 -07:00
Hugo Trippaers 53d1ce75a1 CLOUDSTACK-728 Set vmspec extra config for the Nicira NVP vApp 2013-06-26 15:41:52 -07:00
Hugo Trippaers 98dc68d8c9 CLOUDSTACK-728 For Nicira NVP a specified port-group must be used,
instead of a dynamically configured one.

Refactor bits of the HypervisorHostHelper to better
support multiple BroadcastDomainTypes

Cleanup some parts of the code that was using tab indents and removed some dead code.
2013-06-26 15:41:52 -07:00
Harikrishna Patnala 0d1f512728 CLOUDSTACK-3208: showing xenhost username and password details in plain text in logs when we pefrom removehost from CS
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 15:57:31 +05:30
Nitin Mehta ea7b4467d7 CLOUDSTACK-3050
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:45:57 +05:30
Nitin Mehta f90279d9bb CLOUDSTACK-3050
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:44:48 +05:30
Hiroaki KAWAI 4b3c0128b4 Add missing ASL decl.
ssp mock api is also available under ASL2.0

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-26 13:19:54 +09:00
Hiroaki KAWAI 39ef9240e8 CLOUDSTACK-3194 fix stratosphere ssp plugin packaging
stratosphere-ssp plugin maven pom.xml has some bad settings
and client pom.xml requred dependency for it.
2013-06-26 12:36:01 +09:00
Hugo Trippaers f74e635225 Setting the required version of libvirt to 10.0 for the openvswitch
support. This version actually supports setting the vlan tag on an
interface.
2013-06-25 12:21:25 -07:00
Sateesh Chodapuneedi c36a952f15 CLOUDSTACK-1767 VMWare DVS - cannot use untagged portgroups
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-25 19:43:20 +05:30
Sateesh Chodapuneedi b3927ffe96 CLOUDSTACK-1766 VmWare DVS vmware.ports.per.dvportgroup setting not used
Read the global configuration setting while configuring VmwareManager.
Also enabling autoExpand feature for supported distributed virtual switch versions.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-25 19:15:24 +05:30
Jayapal 1ab87ef4be CLOUDSTACK-3003 Fixed static route issue in vpc vmware 2013-06-25 18:43:00 +05:30
Hiroaki KAWAI 2d6369c826 CLOUDSTACK-2756: Stratosphere SSP plugin
Stratosphere SSP is an SDN solution which creates virtual L2
networks backed by vxlan and vlan. SSP will ask hypervisor to set a
specific vlan, then SSP will interact with openflow switches and
put vxlan/vlan translation flow rules.

This plugin provides SSP as "connctivity" service provider.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-25 15:31:40 +09:00
Hiroaki KAWAI f706f6757c Add class check before cast
DataTO might be one of SnapshotObjectTO, TemplateObjectTO
or VolumeObjectTO
2013-06-25 12:48:01 +09:00
Jayapal 9121191f70 CLOUDSTACK-1578 vmware:Egress default policy configurable using network offering on vmware 2013-06-24 13:37:01 +05:30
Jayapal c22e7d0052 CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering on SRX firewall 2013-06-24 13:37:01 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Abhinandan Prateek 59d7c94247 CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1 2013-06-22 16:04:55 +05:30
Sheng Yang d22306344b Baremetal: Fix permission deny to ipmi.py
The file cloudstack-oss.asf/client/target/cloud-client-ui-4.2.0-SNAPSHOT/WEB-INF/classes/scripts/util/ipmi.py
is not mark as executible, so we cannot execute it directly.

Involve "/usr/bin/python" for it. The position of python file maybe different in
the different machines.
2013-06-21 18:06:04 -07:00
Alena Prokharchyk 22232f2baf CLOUDSTACK-2698: always generate new id when create VirtualRouter. Don't try to re-use the id of the VR that failed to deploy and was expunged as a result of this failure 2013-06-21 15:29:00 -07:00
Sheng Yang 759269fcd8 Baremetal: Fix API's packages and categories 2013-06-21 09:48:30 -07:00
Sheng Yang 041303cc67 Baremetal: Fix typo of BaremetaUserdataProvider
Should be "Baremetal" rather than "Baremeta"
2013-06-21 09:48:25 -07:00
Sheng Yang a6a49490fb Fix baremetal functionality
1. Baremetal doesn't have secondary storage, so we don't need check them.

2. The new "AddBaremetalHostCmd" hasn't been used by UI, so keep the validity
checking out for now. "AddHostCmd" would still works.

3. Baremetal haven't implemented multiple ip range feature(CLOUDSTACK-702),
return true for now for single range.
2013-06-21 09:47:07 -07:00
Sheng Yang f37b089fce Revert "Removing baremetal related references"
This reverts commit 99ea4011b1.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
2013-06-21 09:46:56 -07:00
Alena Prokharchyk ae6e8b448f CLOUDSTACK-3085: network implement - deploy internal lb vm for the ip only when:
* the load balancer contains lb rule in state "Active"
* when lb rule has at least one vm assigned to it
2013-06-20 13:01:32 -07:00
Edison Su 205722aabf fix nonoss build 2013-06-20 10:47:19 -07:00
Alena Prokharchyk bf331064a2 CLOUDSTACK-3091: expect UUID instead of actual DB id, when read internallbvm.service.offering global config 2013-06-20 10:37:59 -07:00
Prasanna Santhanam d08a6a4e7b Revive simulator based on ImageStore changes
Introduced the SimulatorStorageProcessor to handle image store related
commands. Right now only mock implementations are provided, no error
handling, logging, runtime exception scenarios limited. SystemVMs are
able to start up but the default built-in template has trouble in going
to Ready state.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-20 19:42:01 +05:30
Wei Zhou 2899395808 CLOUDSTACK-2017: network throttling implementation for KVM 2013-06-20 11:30:44 +02:00
Edison Su 733ed3622d fix compile 2013-06-20 00:57:06 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Alena Prokharchyk d66e9c7b51 CLOUDSTACK-2843: Provideded an ability to turn off the synchronization being done on the CS agent side,
for number of commands participating in Vm deployment process, as parallel deployment is supported on the hypervisor side.
The behavior is controlled by global config varirables:

"execute.in.sequence.hypervisor.commands" (false by default) sets/resets the synchronization for commands:
=========================
StartCommand
StopCommand
CreateCommand
CopyVolumeCommand

"execute.in.sequence.network.element.commands" (false by default) sets/resets the synchronization for commands:
==========================
DhcpEntryCommand
SavePasswordCommand
UserDataCommand
VmDataCommand

As a part of the fix, increased the global lock timeout to 30 mins in several VR scripts:
===========================
edithosts.sh
savepassword.sh
userdata.sh

to support situations when multiple concurrent calls to the script are being made.
2013-06-19 10:12:13 -07:00