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

set external ipallocator as true by default

This commit is contained in:
edison 2010-09-16 20:52:38 -07:00
parent 9e0f57bc0e
commit b8c1d2ea17
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cloud.spec
View File

@ -532,6 +532,7 @@ fi
%{_datadir}/%{name}/setup/create-schema.sql
%{_datadir}/%{name}/setup/server-setup.sql
%{_datadir}/%{name}/setup/templates.*.sql
%{_datadir}/%{name}/setup/templates.sql
%{_datadir}/%{name}/setup/deploy-db-dev.sh
%{_datadir}/%{name}/setup/server-setup.xml
%{_datadir}/%{name}/setup/data-20to21.sql

2
server/src/com/cloud/api/commands/ListTemplatesCmd.java
View File

@ -58,7 +58,7 @@ public class ListTemplatesCmd extends BaseCmd {
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.PAGE, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.PAGESIZE, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.HYPERVISOR_TYPE, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.HYPERVISOR, Boolean.FALSE));
}

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

@ -130,11 +130,8 @@ public class ConfigurationServerImpl implements ConfigurationServer {
}
boolean externalIpAlloator = Boolean.parseBoolean(_configDao.getValue("direct.attach.network.externalIpAllocator.enabled"));
String hyperVisor = _configDao.getValue("hypervisor.type");
if (hyperVisor.equalsIgnoreCase("KVM") && !externalIpAlloator) {
/*For KVM, it's enabled by default*/
_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
}
_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
// Save Direct Networking service offerings
_configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null);