46dac852fa
Merge branch 'swift'
...
Conflicts:
server/src/com/cloud/agent/AgentManager.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
cef30956e9
Merge branch 'newagentmgr'
...
Conflicts:
agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/network/F5BigIpManagerImpl.java
server/src/com/cloud/network/JuniperSrxManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
a1a0fdc0a3
bug 10588: making sure the vms are synced during a delta also
2011-10-27 15:56:53 +05:30
fc3d93e3e7
bug 9614: let root volume use IDE disk controller by default to ensure backwards compatibility with existing CloudStack deployments
2011-10-24 15:28:51 -07:00
0df249172d
Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM
2011-10-21 19:53:48 -07:00
443c175793
bug 9614: enable SCSI device controller for root disk.(default root disk controller type can be conifgured through global configuration)
2011-10-21 18:44:56 -07:00
06e9da180d
Extending Kevin Brook's original XCP disguised as XS 5.6.100 patch
2011-10-19 22:41:33 -04:00
81a9358eb7
bug 11675: enable RHEL 6 for XCP 1.1
2011-10-14 11:36:40 +05:30
b3e6ab8d1c
add support for XenServer 6.0.0 GA
2011-10-13 15:50:12 -07:00
dce4e74b58
bug 11585: using pre-allocated NIC approach to support additional public interfaces for VMware
2011-10-11 15:40:31 -07:00
c6c5e8f557
bug 11675: fixed error messages
2011-10-11 17:23:12 +05:30
930d0a0815
bug 11675: optimized the code
2011-10-11 16:46:15 +05:30
ceae8cd365
bug 11675: enabling support for XCP 1.1.0
2011-10-11 11:31:02 +05:30
0f5384d086
Bug 11522 - New agent manager
...
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
89e04458b6
Bug 11522 - New agent manager
...
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
2011-10-04 14:35:26 -07:00
683113cc38
Bug 11522 - New agent manager
...
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -07:00
aef74ff521
bug 10579: disable pool vm sync and disable hostTrack for XenServer,
...
status 10579: resolved fixed
reviewed-by: alex
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2011-09-28 12:41:24 -07:00
e5fca855c1
Bug 11522 - New agent manager
...
register/unregister resource state adapter in configure/stop of implementations
2011-09-27 11:51:03 -07:00
e8c13e10c7
Bug 11522 - New agent manager
...
able to compile besides mycloud stuff
2011-09-26 16:55:20 -07:00
d32241ec9c
bug 10971: support vSphere 5
2011-09-26 12:16:28 -07:00
e0e5491c42
Bug 11522 - New agent manager
...
implements ResourceStateAdapter in a couple of components
2011-09-23 11:28:02 -07:00
7a64d8fda4
add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation
2011-09-14 15:15:26 -07:00
f071ce571c
bug 10949: if a cluster doesn't have any hosts, set cluster guid to new one when add host to this cluster.
...
status 10949: resolved fixed
2011-09-13 13:53:23 -07:00
c5bc16ef42
XcpServerDiscoverer is only for XenServer
2011-09-13 11:11:55 -07:00
cbe996e1ce
bug 11403: Making hypervisor_type of xs-tools.iso (id=200) as XenServer. Made the corresponding DB changes as well.
2011-09-13 03:07:32 +05:30
4ad9ac5e71
Bug 11200 - maximum number of guests per host
...
Changes:
To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:
- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there.
2011-09-08 18:08:31 -07:00
aa7f06d7eb
bug 11384: deprecate vmware.guest.nic.device.type global configuration variable
2011-09-08 16:11:17 -07:00
905df61aac
bug 11362: Make VM network adapter device type be selectable based on VM-specific details
2011-09-07 17:58:42 -07:00
84868b7f9c
Bug 11200 - maximum number of guests per host
...
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
2011-09-07 14:53:05 -07:00
13ee22d421
bug 10078:
...
1. introduce migratewait in global configuration, the default value is 1 hour
2. use async xapi VM migration API
status 10078: resolved fixed
2011-09-07 12:36:17 -07:00
01eb08a384
bug 11305: Remove router stop logic from disconnect host.
...
Now the logic is: if we can only connect to one of the two redundant routers, we
would stop the one that can't be connected. If we fail to program both routers,
just let it go.
2011-08-31 19:27:57 -07:00
9ace681547
bug 11162: merge fix from 2.2.10 premium
2011-08-25 15:38:43 -07:00
b3478c377e
Full opensource
2011-08-23 19:52:19 -07:00
4f8a52f94c
Move VMware/Premium Secondary storage VM to opensource
2011-08-23 14:43:39 -07:00
8a7feb8ec1
Merge branch '2.2.y'
...
Conflicts:
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
api/src/com/cloud/agent/api/to/FirewallRuleTO.java
api/src/com/cloud/agent/api/to/IpAddressTO.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
api/src/com/cloud/api/commands/UpdateNetworkCmd.java
api/src/com/cloud/api/response/CapabilitiesResponse.java
api/src/com/cloud/network/Network.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/firewall/FirewallService.java
api/src/com/cloud/network/lb/LoadBalancingRule.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
api/src/com/cloud/network/rules/FirewallRule.java
api/src/com/cloud/network/rules/RulesService.java
api/src/com/cloud/offering/NetworkOffering.java
client/tomcatconf/commands.properties.in
cloud.spec
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
core/src/com/cloud/storage/template/DownloadManagerImpl.java
core/src/com/cloud/vm/DomainRouterVO.java
debian/cloud-deps.install
patches/systemvm/debian/config/etc/init.d/cloud-early-config
patches/systemvm/debian/config/root/ipassoc.sh
patches/systemvm/debian/config/root/loadbalancer.sh
scripts/vm/hypervisor/kvm/rundomrpre.sh
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/agent/manager/AgentAttache.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/agent/manager/AgentMonitor.java
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
server/src/com/cloud/alert/ClusterAlertAdapter.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/cluster/ClusterManagerImpl.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/network/LoadBalancerVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDao.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/element/DhcpElement.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/FirewallManager.java
server/src/com/cloud/network/rules/FirewallRuleVO.java
server/src/com/cloud/network/rules/PortForwardingRuleVO.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/rules/StaticNatRuleImpl.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/server/ConfigurationServerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
server/src/com/cloud/user/AccountManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDao.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/create-index-fk.sql
setup/db/create-schema.sql
setup/db/db/schema-222to224.sql
setup/db/db/schema-227to228.sql
setup/db/db/schema-228to229.sql
setup/db/db/schema-229to2210.sql
tools/testClient/README
ui/scripts/cloud.core.instance.js
utils/src/com/cloud/utils/SerialVersionUID.java
utils/src/com/cloud/utils/db/ConnectionConcierge.java
utils/src/com/cloud/utils/db/Merovingian2.java
utils/src/com/cloud/utils/db/Transaction.java
utils/src/com/cloud/utils/nio/Link.java
utils/src/com/cloud/utils/nio/NioConnection.java
utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
32ee2dbe2c
Remove baremetal specific parameters from AddHostCmd
2011-08-19 17:12:23 -07:00
18f87c2108
Merge branch 'cvm' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
e5e85d05e9
bug 10695: add XCP 1.0 support
...
status 10695: resolved fixed
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
2011-08-09 19:51:32 -07:00
33b3e02c17
bug 10695: add XCP 1.0 support
...
status 10695: resolved fixed
2011-08-09 19:49:12 -07:00
e8c2fa4e8e
Remove baremetal specific parameters from AddHostCmd
2011-08-08 15:01:26 -07:00
6aaf3d5ae0
Merge branch 'cvm'
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/storage/Storage.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
d10c8e2a1d
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:30:50 -07:00
19567df49b
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:27:45 -07:00
bba811a714
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 17:29:16 -07:00
5f9884d97a
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 16:48:27 -07:00
055e5c82c7
bug 9997:
...
put copy scripts in SetupCommand,
1. initiate returns host version,
2. if it doesn't match with DB, update DB, and reconnect the host.
status 9997: resolved fixed
2011-07-29 10:45:11 -07:00
9f2eaca6cb
Support XenServer 6.0 beta
2011-07-20 16:47:48 -07:00
811063f769
bug 10197: enable trackVmHostChange for XenServer
2011-07-19 15:53:41 -07:00
20cbe7e739
bug 10197: enable trackVmHostChange for XenServer
2011-07-19 15:52:45 -07:00
anthony
frank
Abhinandan Prateek
Kelven Yang
David Nalley
frank
Nitin
prachi
Sheng Yang
alena