Fixes #18330: Agent run frequency must not be configurable on policy …

…servers
Normation · Dec 1, 2020 · 95124a7 · 95124a7
1 parent dafb468
commit 95124a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...dder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala b/...dder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala
@@ -303,7 +303,7 @@ class ShowNodeDetailsFromNode(
       "#logsDetails *"      #> Script(OnLoad(logDisplayer.asyncDisplay(node.id,None, "logsGrid"))) &
       "#node_parameters -*" #> (if(node.id == Constants.ROOT_POLICY_SERVER_ID) NodeSeq.Empty else nodeStateEditForm(node).nodeStateConfiguration) &
       "#node_parameters -*" #> agentPolicyModeEditForm.cfagentPolicyModeConfiguration(Some(node.id)) &
-      "#node_parameters -*" #> agentScheduleEditForm(node).cfagentScheduleConfiguration &
+      "#node_parameters -*" #> (if(node.isPolicyServer) NodeSeq.Empty else agentScheduleEditForm(node).cfagentScheduleConfiguration) &
       "#node_parameters *+" #> complianceModeEditForm(node).complianceModeConfiguration &
       "#node_tabs [id]"     #> s"details_${id}"
     ).apply(serverDetailsTemplate)

diff --git a/...rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentAgentSchedule.html b/...rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentAgentSchedule.html
@@ -45,6 +45,9 @@
         <span class="glyphicon glyphicon-info-sign"></span>
       </div>
       <div ng-if="globalRun === undefined">
+        <p>
+          This setting will not be applied to policy server.
+        </p>
         <p>By default, the agent runs on all nodes every 5 minutes.</p>
         <p>
           This high frequency enables fast response times to apply changes and state