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

DB upgrade: Reverting partial commit

This commit is contained in:
alena 2011-05-04 18:24:49 -07:00
parent ddb64dd196
commit 4128c82018
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/upgrade/dao/Upgrade218to22.java
View File

@ -266,7 +266,7 @@ public class Upgrade218to22 implements DbUpgrade {
}
insertNic(conn, guestNetworkId, domrId, running, guestMac, guestIp, guestNetmask, "Create", gateway, vnet, "DirectPodBasedNetworkGuru", true, 0, "Dhcp", null);
} else if (publicIp != null){
} else {
insertNic(conn, publicNetworkId, domrId, running, publicMac, publicIp, publicNetmask, "Create", gateway, publicVlan, "PublicNetworkGuru", true, 2, "Static", null);
long controlNicId = insertNic(conn, controlNetworkId, domrId, running, privateMac, privateIp, privateNetmask, "Start", "169.254.0.1", null, "ControlNetworkGuru", false, 1, "Static",
privateIp != null ? (domrId + privateIp) : null);
@ -279,7 +279,7 @@ public class Upgrade218to22 implements DbUpgrade {
pstmt.close();
}
insertNic(conn, guestNetworkId, domrId, running, guestMac, guestIp, guestNetmask, "Start", null, vnet, "ExternalGuestNetworkGuru", false, 0, "Dhcp", null);
}
}
}