java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 11 +---------
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 7 +++++-
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 5156e4b001ba37c0edb755fb3eb6b0173f228d5a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 8 12:58:06 2011 +0100
IPv6: don't update non-existing cobbler profile
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 29c4ec6..b6124dd 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -592,7 +592,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(getExtraOptions());
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
- cmd.setNetworkInfo(isDhcp, networkInterface);
+ cmd.setNetworkInfo(isDhcp, networkInterface, this.useIpv6Gateway());
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
@@ -606,7 +606,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
cmd.setKernelOptions(kernelOptions);
cmd.setPostKernelOptions(postKernelOptions);
cmd.setScheduledAction(kickstartAction);
- cmd.setNetworkInfo(isDhcp, networkInterface);
+ cmd.setNetworkInfo(isDhcp, networkInterface, this.useIpv6Gateway());
ValidatorError cobblerError = cmd.store();
if (cobblerError != null) {
return cobblerError;
@@ -772,13 +772,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
ksAction.getKickstartActionDetails().setStaticDevice(networkInterface);
}
- SystemRecord rec = this.getHostServer().getCobblerObject(null);
- Map<String, Object> meta = rec.getKsMeta();
- meta.put(KickstartFormatter.USE_IPV6_GATEWAY,
- this.useIpv6Gateway() ? "true" : "false");
- rec.setKsMeta(meta);
- rec.save();
-
return ksAction;
}
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 4ec89b4..17ac326 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
@@ -61,13 +61,16 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
private String postKernelOptions;
private String networkInterface;
private boolean isDhcp;
+ private boolean useIpv6Gateway;
/**
* @param dhcp true if the network type is dhcp
* @param networkInterfaceIn The name of the network interface
*/
- public void setNetworkInfo(boolean dhcp, String networkInterfaceIn) {
+ public void setNetworkInfo(boolean dhcp, String networkInterfaceIn,
+ boolean useIpv6GatewayIn) {
isDhcp = dhcp;
networkInterface = networkInterfaceIn;
+ useIpv6Gateway = useIpv6GatewayIn;
}
/**
@@ -259,6 +262,8 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
getKickstartHost());
}
ksmeta.remove(KickstartFormatter.STATIC_NETWORK_VAR);
+ ksmeta.put(KickstartFormatter.USE_IPV6_GATEWAY,
+ this.useIpv6Gateway ? "true" : "false");
rec.setKsMeta(ksmeta);
rec.setKernelOptions(kernelOptions);
rec.setKernelPostOptions(postKernelOptions);