etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables

This commit is contained in:
Alena Prokharchyk 2012-04-26 10:09:18 -07:00
parent 074f553cb7
commit 5da0fdaecb
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/configuration/Config.java
View File

@ -17,7 +17,6 @@ import java.util.HashMap;
import java.util.List;
import com.cloud.agent.AgentManager;
import com.cloud.cluster.ClusterManager;
import com.cloud.consoleproxy.ConsoleProxyManager;
import com.cloud.ha.HighAvailabilityManager;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@ -298,7 +297,7 @@ public enum Config {
DirectAgentLoadSize("Advanced", ManagementServer.class, Integer.class, "direct.agent.load.size", "16", "The number of direct agents to load each time", null),
//disabling lb as cluster sync does not work with distributed cluster
AgentLbEnable("Advanced", ClusterManager.class, Boolean.class, "agent.lb.enabled", "false", "If agent load balancing enabled in cluster setup", null),
AgentLbEnable("Advanced", ManagementServer.class, Boolean.class, "agent.lb.enabled", "false", "If agent load balancing enabled in cluster setup", null),
SubDomainNetworkAccess("Advanced", NetworkManager.class, Boolean.class, "allow.subdomain.network.access", "true", "Allow subdomains to use networks dedicated to their parent domain(s)", null),
UseExternalDnsServers("Advanced", NetworkManager.class, Boolean.class, "use.external.dns", "false", "Bypass internal dns, use exetrnal dns1 and dns2", null),
EncodeApiResponse("Advanced", ManagementServer.class, Boolean.class, "encode.api.response", "false", "Do UTF-8 encoding for the api response, false by default", null),
@ -417,7 +416,11 @@ public enum Config {
return "StorageAllocator";
} else if (_componentClass == NetworkManager.class) {
return "NetworkManager";
} else {
} else if (_componentClass == StorageManager.class) {
return "StorageManager";
} else if (_componentClass == TemplateManager.class) {
return "TemplateManager";
}else {
return "none";
}
}

18
setup/db/db/schema-302to303.sql
View File

@ -82,8 +82,24 @@ CREATE TABLE `cloud`.`ovs_tunnel_network`(
`port_name` varchar(32) COMMENT 'in port on open vswitch',
`state` varchar(16) default 'FAILED' COMMENT 'result of tunnel creatation',
PRIMARY KEY(`from`, `to`, `network_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO `cloud`.`ovs_tunnel_interface` (`ip`, `netmask`, `mac`, `host_id`, `label`) VALUES ('0', '0', '0', 0, 'lock');
INSERT INTO `cloud`.`ovs_tunnel_network` (`from`, `to`, `network_id`, `key`, `port_name`, `state`) VALUES (0, 0, 0, 0, 'lock', 'SUCCESS');
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='external.network.stats.interval';
UPDATE `cloud`.`configuration` set category='Advanced' where name='guest.domain.suffix';
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='network.guest.cidr.limit';
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.cpu.mhz';
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.ram.size';
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.stats.interval';
UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.template.id';
UPDATE `cloud`.`configuration` set category='Advanced ' where name='capacity.skipcounting.hours';
UPDATE `cloud`.`configuration` set category='Advanced ' where name='use.local.storage';
UPDATE `cloud`.`configuration` set category='Hidden ' where name='router.ram.size';
UPDATE `cloud`.`configuration` set category='Hidden ' where name='secondary.storage.vm';
UPDATE `cloud`.`configuration` set category='Hidden ' where name='security.hash.key';