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

server-setup.xml: Add physical network enabled by default 

Also add uuid for physical networks and zones. And fix server-setup.xml example.
This commit is contained in:
Sheng Yang 2011-12-13 18:30:49 -08:00
parent 575d453e53
commit e393dcd069
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/test/PodZoneConfig.java
View File

@ -306,6 +306,8 @@ public class PodZoneConfig {
values += ",'" + networkType + "'";
}
columns += ", uuid";
values += ", UUID()";
columns += ")";
values += ")";
@ -335,6 +337,11 @@ public class PodZoneConfig {
columns += ", vnet";
values += ",'" + vnetStart + "-" + vnetEnd + "'";
columns += ", state";
values += ", 'Enabled'";
columns += ", uuid";
values += ", UUID()";
columns += ")";
values += ")";

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

@ -13,14 +13,15 @@
<zone>
<id>1</id>
<name>NM</name>
<physicalNetworkId>200</physicalNetworkId>
<dns1>4.2.2.2</dns1>
<dns2>10.10.10.14</dns2>
<internalDns1>4.2.2.2</internalDns1>
<internalDns2>4.2.2.2</internalDns2>
<gateway>10.91.28.1</gateway>
<netmask>255.255.255.0</netmask>
<vnet>560-579</vnet>
<netmask>255.255.255.0</netmask>
<vnet>560-579</vnet>
<guestNetworkCidr>10.1.1.0/24</guestNetworkCidr>
<networktype>Advanced</networktype>
</zone>
</zones>