cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [26/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to e90d595
Date Wed, 26 Feb 2014 18:50:13 GMT
templates: Add FreeBSD 10 template

With VirtIO enabled on KVM. FreeBSD 10 supports VirtIO for both the
network and the disks. This frees us from IDE and E1000 which should
also improve performance.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abf3c055
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abf3c055
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abf3c055

Branch: refs/heads/acl-item-cidrs
Commit: abf3c055c22cf504a79066b1ec5ec3ac022a486c
Parents: bb23e3a
Author: Wido den Hollander <wido@widodh.nl>
Authored: Tue Feb 18 17:44:38 2014 +0100
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue Feb 25 14:56:24 2014 +0100

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java   | 2 ++
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java   | 2 +-
 setup/db/db/schema-430to440.sql                                   | 3 ++-
 setup/db/templates.sql                                            | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
index f76b8a7..11d1e16 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
@@ -126,6 +126,8 @@ public class KVMGuestOsMapper {
         s_mapper.put("Windows NT 4", "Windows NT");
         s_mapper.put("Windows 3.1", "Windows 3.1");
         s_mapper.put("Windows PV", "Other PV");
+        s_mapper.put("FreeBSD 10 (32-bit)", "FreeBSD 10");
+        s_mapper.put("FreeBSD 10 (64-bits", "FreeBSD 10");
         s_mapper.put("Other PV (32-bit)", "Other PV");
         s_mapper.put("Other PV (64-bit)", "Other PV");
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 26407a1..853b7a9 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -4694,7 +4694,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
                 guestOSName.startsWith("CentOS 5.5") || guestOS.startsWith("CentOS") || guestOS.startsWith("Fedora")
||
                 guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || guestOSName.startsWith("Red
Hat Enterprise Linux 5.4") ||
                 guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || guestOSName.startsWith("Red
Hat Enterprise Linux 6") || guestOS.startsWith("Debian GNU/Linux") ||
-                guestOSName.startsWith("Other PV")) {
+                guestOSName.startsWith("FreeBSD 10") || guestOSName.startsWith("Other PV"))
{
             return true;
         } else {
             return false;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 116731d..0ded7a9 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -540,4 +540,5 @@ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `display` tinyint(1)
NOT NULL
 ALTER TABLE `cloud`.`s2s_vpn_connection` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'1' COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`s2s_vpn_gateway` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1'
COMMENT 'True if the entry can be displayed to the end user';
 
-
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (225,
UUID(), 9, 'FreeBSD 10 (32-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (226,
UUID(), 9, 'FreeBSD 10 (64-bit)');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 5b46c9a..a99a6cd 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -272,6 +272,8 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(221
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (222, UUID(),
7, 'Apple Mac OS X 10.6 (64-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (223, UUID(),
7, 'Apple Mac OS X 10.7 (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (224, UUID(),
7, 'Apple Mac OS X 10.7 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (225, UUID(),
9, 'FreeBSD 10 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (226, UUID(),
9, 'FreeBSD 10 (64-bit)');
 
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (200, UUID(),
1, 'Other CentOS (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (201, UUID(),
1, 'Other CentOS (64-bit)');


Mime
View raw message