diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 246950a5500e..42ae18d98e77 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -369,6 +369,11 @@ public class ConfigDefaults { */ public static final String UNIFY_CUSTOM_CHANNEL_MANAGEMENT = "java.unify_custom_channel_management"; + /** + * Specify the number of minutes to wait before performing a system reboot + * */ + public static final String MINUTES_TO_WAIT_BEFORE_REBOOT = "minutes_to_wait_before_reboot"; + /** * Disable SSL redirection */ @@ -1147,4 +1152,12 @@ public boolean isSsl() { public long getRhuiDefaultOrgId() { return Config.get().getInt(RHUI_DEFAULT_ORG_ID, 1); } + + /** + * Returns the number of minutes to wait before performing a system reboot + * @return the minutes to wait before a system reboot + * */ + public int getMinutesToWaitBeforeReboot() { + return Config.get().getInt(MINUTES_TO_WAIT_BEFORE_REBOOT, 3); + } } diff --git a/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java b/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java index f3881187a5cc..2a01d9a02003 100644 --- a/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java +++ b/java/code/src/com/suse/manager/webui/services/SaltServerActionService.java @@ -1273,10 +1273,11 @@ private Map, List> hardwareRefreshListAction( } private Map, List> rebootAction(List minionSummaries) { + int minutesToWaitBeforeReboot = ConfigDefaults.get().getMinutesToWaitBeforeReboot(); return minionSummaries.stream().collect( Collectors.groupingBy( m -> m.isTransactionalUpdate() ? TransactionalUpdate.reboot() : - com.suse.salt.netapi.calls.modules.System.reboot(Optional.of(3)) + com.suse.salt.netapi.calls.modules.System.reboot(Optional.of(minutesToWaitBeforeReboot)) ) ); }