java/code
Milan Zazrivec
mzazrive at fedoraproject.org
Tue Jun 19 14:43:44 UTC 2012
java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 8 ++++++++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 61b42bd084ebd879d8e7aba66bbcc7c3154f780e
Author: Milan Zazrivec <mzazrivec at redhat.com>
Date: Tue Jun 19 16:40:56 2012 +0200
797906 - don't sync virt bridge nic w/ cobbler
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
index c6f14f3..794dcce 100644
--- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
+++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
@@ -339,6 +339,14 @@ Serializable {
}
/**
+ * isVirtBridge tells if nic is a virtual bridge
+ * @return true if the nic is a virtual bridge, false otherwise
+ */
+ public boolean isVirtBridge() {
+ return ("bridge".equals(module) && getName().startsWith("virbr"));
+ }
+
+ /**
* Retrieve list of IPv6 addresses
* @return List of ServerNetAddress6 objects
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 6de20f8..f8e3040 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -323,7 +323,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
if (serverIn.getNetworkInterfaces() != null) {
for (NetworkInterface n : serverIn.getNetworkInterfaces()) {
// don't create a physical network device for a bond
- if (n.isPublic() && !n.isBond()) {
+ if (n.isPublic() && !n.isVirtBridge() && !n.isBond()) {
Network net = new Network(getCobblerConnection(),
n.getName());
net.setIpAddress(n.getIpaddr());
More information about the spacewalk-commits
mailing list