apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

changing domain.suffix to guest.domain.suffix, along with associated deps

Browse Source
This commit is contained in:
abhishek 2010-12-27 16:58:34 -08:00
parent 788d30ce48
commit 719f3984d2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ public enum Config {
GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null),
MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed.", null),
GuestDomainSuffix("Network", AgentManager.class, String.class, "domain.suffix", "cloud-test.cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud-test.cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null),
//VPN
RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null),

2
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -846,7 +846,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
_instance = "DEFAULT";
}
_networkDomain = configs.get("domain.suffix");
_networkDomain = configs.get("guest.domain.suffix");
s_logger.info("Router configurations: " + "ramsize=" + _routerRamSize + "; templateId=" + _routerTemplateId);

4
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -165,7 +165,7 @@ public class DatabaseConfig {
s_configurationDescriptions.put("port", "port to listen on for agent connection");
//s_configurationDescriptions.put("guest.ip.network", "ip address for the router");
//s_configurationDescriptions.put("guest.netmask", "default netmask for the guest network");
s_configurationDescriptions.put("domain.suffix", "domain suffix for users");
s_configurationDescriptions.put("guest.domain.suffix", "domain suffix for users");
s_configurationDescriptions.put("instance.name", "Name of the deployment instance");
s_configurationDescriptions.put("storage.overprovisioning.factor", "Storage Allocator overprovisioning factor");
s_configurationDescriptions.put("retries.per.host", "The number of times each command sent to a host should be retried in case of failure.");
@ -260,7 +260,7 @@ public class DatabaseConfig {
s_configurationComponents.put("ping.interval", "AgentManager");
s_configurationComponents.put("alert.wait", "AgentManager");
s_configurationComponents.put("update.wait", "AgentManager");
s_configurationComponents.put("domain.suffix", "AgentManager");
s_configurationComponents.put("guest.domain.suffix", "AgentManager");
s_configurationComponents.put("consoleproxy.ram.size", "AgentManager");
s_configurationComponents.put("consoleproxy.cmd.port", "AgentManager");
s_configurationComponents.put("consoleproxy.loadscan.interval", "AgentManager");

4
setup/db/server-setup.xml
View File

@ -193,9 +193,9 @@
<value>ZONE1</value>
</configuration>
<!--
The domain.suffix parameter...
The guest.domain.suffix parameter...
--> <configuration>
<name>domain.suffix</name>
<name>guest.domain.suffix</name>
<value>qatest-vmops.com</value>
</configuration>
<!--