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

fix wrong configuration for oss

This commit is contained in:
Edison Su 2011-02-08 13:22:21 -05:00
parent 08abe76f15
commit 0bd6950bb8
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -575,7 +575,7 @@ public class VirtualRoutingResource implements Manager {
s_logger.warn("Incoming public ip address is overriden. Will always be using the same ip address: " + _publicIpAddress);
}
_firewallPath = findScript("firewall.sh");
_firewallPath = findScript("call_firewall.sh");
if (_firewallPath == null) {
throw new ConfigurationException("Unable to find the firewall.sh");
}

26
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -162,22 +162,16 @@ public class ConfigurationServerImpl implements ConfigurationServer {
}
}
if (_configDao.isPremium()) {
// Default value is set as KVM because of FOSS build, when we are
// running under premium, autoset to XenServer if we know it is from FOSS settings
_configDao.update("secondary.storage.vm", "true");
s_logger.debug("ConfigurationServer made secondary storage vm required.");
_configDao.update("secstorage.encrypt.copy", "true");
s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
_configDao.update("secstorage.secure.copy.cert", "realhostip");
s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");
} else {
/*FOSS release, make external DHCP mode as default*/
_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
}
_configDao.update("secondary.storage.vm", "true");
s_logger.debug("ConfigurationServer made secondary storage vm required.");
_configDao.update("secstorage.encrypt.copy", "true");
s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
_configDao.update("secstorage.secure.copy.cert", "realhostip");
s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");
// Save Direct Networking service offerings
createServiceOffering(User.UID_SYSTEM, "Small Instance", 1, 512, 500, "Small Instance, $0.05 per hour", false, false, false, null);