You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/12/17 12:05:06 UTC
[1/2] git commit: updated refs/heads/4.3 to 03f1bae
Updated Branches:
refs/heads/4.3 340e29d7b -> 03f1bae21
CLOUDSTACK-5365 added route for mgmt cidr in the VR running on HyperV
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03f1bae2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03f1bae2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03f1bae2
Branch: refs/heads/4.3
Commit: 03f1bae21c532aa3b39ba5ed3bc901ae02f044ba
Parents: 6d6c3c3
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Dec 17 16:39:26 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Dec 17 16:40:01 2013 +0530
----------------------------------------------------------------------
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03f1bae2/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 4b030e8..a3cafa5 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1936,7 +1936,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
} else if (nic.getTrafficType() == TrafficType.Control) {
controlNic = nic;
// DOMR control command is sent over management server in VMware
- if (dest.getHost().getHypervisorType() == HypervisorType.VMware) {
+ if (dest.getHost().getHypervisorType() == HypervisorType.VMware || dest.getHost().getHypervisorType() == HypervisorType.Hyperv) {
s_logger.info("Check if we need to add management server explicit route to DomR. pod cidr: " + dest.getPod().getCidrAddress() + "/" +
dest.getPod().getCidrSize() + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + ClusterManager.ManagementHostIPAdr.value());
[2/2] git commit: updated refs/heads/4.3 to 03f1bae
Posted by ra...@apache.org.
CLOUDSTACK-5321 Added default guest template centos 6.4-x64 and modified hyperv systemvm template download url
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d6c3c35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d6c3c35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d6c3c35
Branch: refs/heads/4.3
Commit: 6d6c3c35cd3d5efc61942d1c175c6d630cf79e92
Parents: 340e29d
Author: Rajesh Battala <ra...@citrix.com>
Authored: Thu Dec 5 16:12:47 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Dec 17 16:40:01 2013 +0530
----------------------------------------------------------------------
setup/db/templates.sql | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d6c3c35/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index e5a653c..0f7958f 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -37,7 +37,10 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created,
VALUES (8, UUID(), 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/4.2/systemvmtemplate-4.2-vh7.ova', '8fde62b1089e5844a9cd3b9b953f9596', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware' );
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
- VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-xen.vhd.bz2', 'fb1b6e032a160d86f2c28feb5add6d83', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv' );
+ VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2013-12-04-hyperv.vhd.bz2', 'fb1b6e032a160d86f2c28feb5add6d83', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv' );
+
+INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
+ VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) no GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/4.3/centos6_4_64bit.vhd.bz2', '89d124c4e7c93b88638b2a0e286c54f2', 0, 'CentOS 6.4 (64-bit) no GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1);
INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (1, UUID(), 'CentOS');
INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (2, UUID(), 'Debian');