Alena Prokharchyk
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Wido den Hollander
2ce632cf0b
agent: Fix typo for error message when HVM is not enabled
2012-08-08 22:31:06 +02:00
Wido den Hollander
a12a0081e9
agent: Exit when local.storage.uuid is not set
...
We used to generate a UUID when this wasn't set, but since we aren't writing to
agent.properties anymore we have to make sure the UUID is persistent across restarts.
2012-08-08 22:31:06 +02:00
Wido den Hollander
57a14266d8
agent: Remove dummy debug line
...
This does nothing
2012-08-08 22:31:06 +02:00
Wido den Hollander
9fe611037f
agent: Set default values for all variables
2012-08-08 22:31:06 +02:00
Wido den Hollander
c4f847518f
agent: Never write to agent.properties
...
A daemon should never write to a configuration file
Admins might use tools like Puppet and they don't like changing files
2012-08-08 22:31:06 +02:00
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Sheng Yang
c4eadf3011
S2S VPN: CS-15884: Delete iptables rules after delete vpn connection
2012-08-07 16:32:22 -07:00
Wido den Hollander
f1053f3e3e
kvm: Only select emulators which are x84_64 architecture
...
Libvirt can also return a bunch of emulators for eg ARM and S390
We filter those out since we do not support these architectures.
This way we don't try to start a x86_64 instance with a S390 emulator
2012-08-07 23:17:52 +02:00
Wido den Hollander
a1b9b52164
kvm: Remove hardcoded 'cloud' qemu binaries for Hypervisor detection
...
With the upcoming Apache release we don't ship custom Qemu builds.
libvirt should provide us with the correct information.
2012-08-07 23:17:52 +02:00
Sheng Yang
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
Alena Prokharchyk
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
Chip Childers
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
Wido den Hollander
5fa300cd9c
kvm: Define CPU shares in domain XML
...
Since libvirt 0.9.0 this can be specified in the XML.
This used to be set by invoking virsh after starting the instance, but this is cleaner.
2012-08-07 17:49:58 +02:00
Wido den Hollander
9212995501
kvm: Fix two small typos
2012-08-07 17:19:38 +02:00
Sheng Yang
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
Hugo Trippaers
dd6fd2b68d
Remove XTrustProvider as this class is kept within the
...
cloud-iControl.jar.
2012-08-06 16:31:36 +02:00
Alena Prokharchyk
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
Alena Prokharchyk
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
Chip Childers
3a882fa17c
License header updates for the plugins folder.
2012-08-03 09:07:43 -04:00
anthony
9b43753399
VPC : handle Revoke rules for staticroute
2012-08-02 18:59:49 -07:00
Alena Prokharchyk
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
Wido den Hollander
1276aedd35
rbd: Remove debug line
...
This is no longer needed. It was here for testing purposes, but it was actually a bug in libvirt which has been resolved.
2012-08-02 23:05:00 +02:00
Alena Prokharchyk
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Alena Prokharchyk
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
Kelven Yang
1aa4ed84b9
Merge VPC support in VMware integration
2012-08-01 17:27:59 -07:00
Edison Su
05df0a1965
Another clean up for unnecessary parameter conn Clean up unused
...
parameter conn. Add test for LibvirtVMDef Add support for ethernet type
RB: https://reviews.apache.org/r/6284/
Send-by: tomoe@midokura.com
2012-08-01 13:59:11 -07:00
Wido den Hollander
2ffc9907f7
kvm: Use libvirt for polling storage pool capacity and allocation
...
Since we are using libvirt for handling our storage pools we should rely on that information as well.
Before fetching the capacity we refresh the pool so libvirt has the most up-to-date information.
This is not needed with newly created pools since libvirt does a refresh on creation.
2012-08-01 17:18:11 +02:00
Wido den Hollander
34ed15e44e
kvm: Remove main methods in various classes
...
This is dead code which seems to be in there from the VMOps time.
No reason for this to be here, so this can safely be removed
2012-08-01 14:42:31 +02:00
Hugo Trippaers
65daade79a
Add a "ping" function to the resource and allow commands to be retried.
2012-08-01 14:11:32 +02:00
Alena Prokharchyk
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
Wido den Hollander
cc08eee215
plugin: Rename cloud-kvm.jar to cloud-plugin-hypervisor-kvm.jar
...
This way we stay consistent with naming our plugins.
2012-07-31 22:18:56 +02:00
Edison Su
7a0a9231c3
Move KVM related code into plugins/hypervisor/kvm, a new jar file is
...
created: cloud-kvm.jar
2012-07-30 14:55:47 -07:00
Hugo Trippaers
b4bcd7f3fe
Use the name of the network (or uuid) as display text of the nicira logical switch.
2012-07-30 15:17:46 +02:00
Hugo Trippaers
236f63fd34
When cleaning up or setting ip associations the NiciraNvpElement should be ignored.
...
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
2012-07-30 15:17:35 +02:00
kishan
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
olgasmola
12c7fb3625
Fix build script typo.
2012-07-27 23:37:45 -04:00
Sheng Yang
8eee8f342e
S2S VPN: CS-15650: Add connection status update to s2s vpn
2012-07-27 16:28:06 -07:00
anthony
2fc1dc0df6
VPC : vpc integration code for XenServer hypervisor
2012-07-27 15:54:30 -07:00
Alena Prokharchyk
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
kishan
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
olgasmola
c1989a5e5f
Fix build script typo.
2012-07-27 16:36:02 +03:00
Edison Su
764678f558
CS-15521 Xenserver based User VM failed to HA when vrouter runs on ESXi
...
return false as an answer when executing PingTestCommand in
VMwareResource
RB:https://reviews.apache.org/r/5903/
Send-by: mice_xia@tcloudcomputing.com
2012-07-26 10:43:33 -07:00
Alena Prokharchyk
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
Edison Su
576d093e9c
fix CS-15432 Failed to detach VMware tools ISO after VMware tools
...
installation
RB: https://reviews.apache.org/r/5738/
Send-by: mice_xia@tcloudcomputing.com
2012-07-24 13:44:55 -07:00
David Nalley
4421cd9dee
fixing a few more license headers
2012-07-24 10:47:03 -04:00
Sheng Yang
f1e2be7157
CS-15511: Fix parameter transfer in bash
...
[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2012-07-23 14:51:40 -07:00
bfederle
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00