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

bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all" 

status 10710: resolved fixed

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/db/schema-228to229.sql
This commit is contained in:
alena 2011-07-19 09:43:36 -07:00
parent b92208c91c
commit e2eac341a4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/api/commands/CreateTemplateCmd.java
View File

@ -28,7 +28,6 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.api.response.TemplateResponse;
import com.cloud.async.AsyncJob;

4
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -475,10 +475,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
return "Please enter valid hypervisor type";
}
}
} else {
}else {
String[] options = range.split(",");
for (String option : options) {
if (option.trim().equals(value)) {
if (option.trim().equalsIgnoreCase(value)) {
return null;
}
}

2
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
View File

@ -82,7 +82,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
joinStateNetwork.and("guestType", joinStateNetwork.entity().getGuestType(), Op.EQ);
StateNetworkTypeSearch.join("network", joinStateNetwork, joinStateNetwork.entity().getId(), StateNetworkTypeSearch.entity().getNetworkId(), JoinType.INNER);
StateNetworkTypeSearch.done();
OutsidePodSearch = createSearchBuilder();
OutsidePodSearch.and("network", OutsidePodSearch.entity().getNetworkId(), Op.EQ);
OutsidePodSearch.and("podId", OutsidePodSearch.entity().getPodIdToDeployIn(), Op.NEQ);

1
setup/db/db/schema-228to229.sql
View File

@ -6,6 +6,7 @@ ALTER TABLE `cloud`.`account` ADD COLUMN `network_domain` varchar(255);
ALTER TABLE `cloud`.`domain` ADD COLUMN `network_domain` varchar(255);
ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE;
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'network.dns.basiczone.updates', 'all', 'This parameter can take 2 values: all (default) and pod. It defines if DHCP/DNS requests have to be send to all dhcp servers in cloudstack, or only to the one in the same pod');
ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__pod_id`;
ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__data_center_id`;