From 9e92206e640faf067647a74e55cdbe9707140d71 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 11 Nov 2013 16:29:22 -0800 Subject: [PATCH] CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 4.2-4.2.1 upgrade path Conflicts: setup/db/db/schema-420to421.sql --- setup/db/db/schema-420to421.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql index d429b30c014..1d2848535bf 100644 --- a/setup/db/db/schema-420to421.sql +++ b/setup/db/db/schema-420to421.sql @@ -221,3 +221,6 @@ CREATE VIEW `cloud`.`user_vm_view` AS update `cloud`.`volumes` v, `cloud`.`volume_host_ref` vhr set v.format=vhr.format where v.id=vhr.volume_id and v.format is null; +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default valule "default" means using default option of ipmitool'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface will be temporary out of order after power opertions(e.g. cycle, on), it leads following commands fail immediately. The value specifies retry times before accounting it as real failure"); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout in seconds');