From 51a5919be13daa3c2d46f782a8ff71052ca87d80 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 28 Nov 2012 23:32:31 -0800 Subject: [PATCH] devcloud: fix configuations for default devcloud.sql Patch moves config. info from cfg file to .sql file. Adds more options so DevCloud can run on host-only IPs and cidr. Signed-off-by: Rohit Yadav --- tools/devcloud/devcloud.cfg | 30 ------------------------------ tools/devcloud/devcloud.sql | 8 ++++++++ 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg index d0ea32c36aa..8d296eb7b98 100644 --- a/tools/devcloud/devcloud.cfg +++ b/tools/devcloud/devcloud.cfg @@ -80,36 +80,6 @@ "file": "/tmp/testcase.log" } ], - "globalConfig": [ - { - "name": "expunge.workers", - "value": "3" - }, - { - "name": "expunge.delay", - "value": "60" - }, - { - "name": "expunge.interval", - "value": "60" - }, - { - "name":"enable.ec2.api", - "value":"true" - }, - { - "name":"system.vm.use.local.storage", - "value":"true" - }, - { - "name":"enable.s3.api", - "value":"true" - }, - { - "name":"host", - "value":"192.168.56.1" - } - ], "mgtSvr": [ { "mgtSvrIp": "127.0.0.1", diff --git a/tools/devcloud/devcloud.sql b/tools/devcloud/devcloud.sql index 6bcbcf7e6c5..cebf5a3702e 100644 --- a/tools/devcloud/devcloud.sql +++ b/tools/devcloud/devcloud.sql @@ -26,6 +26,14 @@ INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','cons INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','ssvm.ram.size','100'); INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','ssvm.cpu.mhz','100'); INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'system.vm.use.local.storage', 'true'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.workers', '3'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.delay', '60'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.interval', '60'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'enable.ec2.api', 'true'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'enable.s3.api', 'true'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'host', '192.168.56.1'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'management.network.cidr', '192.168.56.0/24'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'secstorage.allowed.internal.sites', '192.168.56.0/8'); UPDATE `cloud`.`configuration` SET value='10' where name = 'storage.overprovisioning.factor'; UPDATE `cloud`.`configuration` SET value='10' where name = 'cpu.overprovisioning.factor'; UPDATE `cloud`.`configuration` SET value='10' where name = 'mem.overprovisioning.factor';