cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [01/50] git commit: updated refs/heads/marvin to df58f51
Date Wed, 29 Jan 2014 08:53:36 GMT
Updated Branches:
  refs/heads/marvin dedd41ed8 -> df58f51e3


CLOUDSTACK-5953: In hypervisor_capabilities, max_guests_limit are
not correct for XS 6.2 or other specific version hypervisor.


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

Branch: refs/heads/marvin
Commit: a735de8f85cc969d4b03b56eb7584955db9096f0
Parents: b25ee92
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Mon Jan 27 22:50:40 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Mon Jan 27 22:50:40 2014 +0530

----------------------------------------------------------------------
 setup/db/db/schema-430to440.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a735de8f/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 0ce9202..3fa3402 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -24,6 +24,9 @@ SET foreign_key_checks = 0;
 
 ALTER TABLE `cloud`.`disk_offering` ADD `cache_mode` VARCHAR( 16 ) DEFAULT 'none' COMMENT
'The disk cache mode to use for disks created with this offering';
 
+UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='150' WHERE hypervisor_version='6.1.0';
+UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='500' WHERE hypervisor_version='6.2.0';
+
 DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
 CREATE VIEW `cloud`.`disk_offering_view` AS
     select
@@ -443,4 +446,4 @@ CREATE VIEW `cloud`.`user_vm_view` AS
            left join
         `cloud`.`user_vm_details` `custom_ram_size`  ON (((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`)
and (`custom_ram_size`.`name` = 'memory')));
 
-INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description,
default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'vm.network.nic.max.secondary.ipaddresses',
NULL, 'Specify the number of secondary ip addresses per nic per vm', '256') ON DUPLICATE KEY
UPDATE category='NetworkManager';
\ No newline at end of file
+INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description,
default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'vm.network.nic.max.secondary.ipaddresses',
NULL, 'Specify the number of secondary ip addresses per nic per vm', '256') ON DUPLICATE KEY
UPDATE category='NetworkManager';


Mime
View raw message