Passive mode for project

rundeckapp/grails-app/controllers/rundeck/controllers/FrameworkController.groovy

@@ -44,6 +44,7 @@ import rundeck.ScheduledExecution
 import rundeck.services.ApiService
 import rundeck.services.AuthorizationService
 import rundeck.services.PasswordFieldsService
+import rundeck.services.ScheduledExecutionService
 import rundeck.services.framework.RundeckProjectConfigurable
 
 import javax.servlet.http.HttpServletRequest
@@ -80,6 +81,7 @@ import rundeck.filters.ApiRequestFilters
 class FrameworkController extends ControllerBase implements ApplicationContextAware {
     FrameworkService frameworkService
     ExecutionService executionService
+    ScheduledExecutionService scheduledExecutionService
     UserService userService
 
     PasswordFieldsService resourcesPasswordFieldsService
@@ -1090,6 +1092,17 @@ class FrameworkController extends ControllerBase implements ApplicationContextAw
             projProps.putAll(inputProps)
             def inputMap = new HashMap(inputProps)
 
+            def isExecutionDisabledNow = !scheduledExecutionService.isProjectExecutionEnabled(project)
+            def isScheduleDisabledNow = !scheduledExecutionService.isProjectScheduledEnabled(project)
+
+
+            def newExecutionDisabledStatus = (projProps['project.disable.executions'] && projProps['project.disable.executions'] == 'true')
+            def newScheduleDisabledStatus = (projProps['project.disable.schedule'] && projProps['project.disable.schedule'] == 'true')
+
+            def reschedule = ((isExecutionDisabledNow != newExecutionDisabledStatus)
+                    || (isScheduleDisabledNow != newScheduleDisabledStatus))
+            def active = (!newExecutionDisabledStatus && !newScheduleDisabledStatus)
+
             final nodeExecType = frameworkService.getDefaultNodeExecutorService(projProps)
             final nodeConfig = frameworkService.getNodeExecConfigurationForType(nodeExecType, projProps)
 
@@ -1180,6 +1193,13 @@ class FrameworkController extends ControllerBase implements ApplicationContextAw
                 if (!result.success) {
                     errors << result.error
                 }
+                if(reschedule){
+                    if(active){
+                        scheduledExecutionService.rescheduleJobs(frameworkService.isClusterModeEnabled()?frameworkService.getServerUUID():null, project)
+                    }else{
+                        scheduledExecutionService.unscheduleJobsForProject(project, frameworkService.isClusterModeEnabled()?frameworkService.getServerUUID():null, project)
+                    }
+                }
             }
 
             if (!errors) {
@@ -1252,6 +1272,20 @@ class FrameworkController extends ControllerBase implements ApplicationContextAw
             }else{
                 projProps['project.description']=''
             }
+
+            def isExecutionDisabledNow = !scheduledExecutionService.isProjectExecutionEnabled(project)
+            def isScheduleDisabledNow = !scheduledExecutionService.isProjectScheduledEnabled(project)
+
+            def newExecutionDisabledStatus = (params.disableExecutionMode && params.disableExecutionMode == 'true')
+            def newScheduleDisabledStatus = (params.disableScheduleMode && params.disableScheduleMode == 'true')
+
+            projProps['project.disable.executions']=newExecutionDisabledStatus?'true':'false'
+            projProps['project.disable.schedule']=newScheduleDisabledStatus?'true':'false'
+
+            def reschedule = ((isExecutionDisabledNow != newExecutionDisabledStatus)
+                    || (isScheduleDisabledNow != newScheduleDisabledStatus))
+            def active = (!newExecutionDisabledStatus && !newScheduleDisabledStatus)
+
             def Set<String> removePrefixes=[]
             removePrefixes<< FrameworkProject.PROJECT_RESOURCES_URL_PROPERTY
             if (params.defaultNodeExec) {
@@ -1384,6 +1418,13 @@ class FrameworkController extends ControllerBase implements ApplicationContextAw
             if (!errors) {
 
                 def result = frameworkService.updateFrameworkProjectConfig(project, projProps, removePrefixes)
+                if(reschedule){
+                    if(active){
+                        scheduledExecutionService.rescheduleJobs(frameworkService.isClusterModeEnabled()?frameworkService.getServerUUID():null, project)
+                    }else{
+                        scheduledExecutionService.unscheduleJobsForProject(project,frameworkService.isClusterModeEnabled()?frameworkService.getServerUUID():null)
+                    }
+                }
                 if (!result.success) {
                     errors << result.error
                 }
@@ -1499,6 +1540,8 @@ class FrameworkController extends ControllerBase implements ApplicationContextAw
         [
             project: project,
             projectDescription:fwkProject.getProjectProperties().get("project.description"),
+            disableExecutionMode:fwkProject.getProjectProperties().get("project.disable.executions"),
+            disableScheduleMode:fwkProject.getProjectProperties().get("project.disable.schedule"),
             resourceModelConfigDescriptions: resourceDescs,
             configs: resourceConfig,
             nodeexecconfig:nodeConfig,

rundeckapp/grails-app/controllers/rundeck/controllers/MenuController.groovy

@@ -785,6 +785,8 @@ class MenuController extends ControllerBase implements ApplicationContextAware{
                     nodeErrorsMap:nodeErrorsMap,
                 resourceModelConfigDescriptions:descriptions,
                 nodeexecconfig:nodeexec,
+                    disableExecutionMode:fproject.getProjectProperties().get("project.disable.executions"),
+                    disableScheduleMode:fproject.getProjectProperties().get("project.disable.schedule"),
                 fcopyconfig:fcopy,
                 defaultNodeExec: defaultNodeExec,
                 defaultFileCopy: defaultFileCopy,

rundeckapp/grails-app/controllers/rundeck/controllers/ScheduledExecutionController.groovy

@@ -2344,11 +2344,17 @@ class ScheduledExecutionController  extends ControllerBase{
             return [success:false,error:'unauthorized',message:msg]
         }
 
+
         if(!executionService.executionsAreActive){
             def msg=g.message(code:'disabled.execution.run')
             return [success:false,failed:true,error:'disabled',message:msg]
         }
 
+        if(!scheduledExecutionService.isProjectExecutionEnabled(scheduledExecution.project)){
+            def msg=g.message(code:'project.execution.disabled')
+            return [success:false,failed:true,error:'disabled',message:msg]
+        }
+
         if (!scheduledExecution.hasExecutionEnabled()) {
             def msg=g.message(code:'scheduleExecution.execution.disabled')
             return [success:false,failed:true,error:'disabled',message:msg]
@@ -2888,6 +2894,11 @@ class ScheduledExecutionController  extends ControllerBase{
             return [success:false,failed:true,error:'disabled',message: msg]
         }
 
+        if(!scheduledExecutionService.isProjectExecutionEnabled(scheduledExecution.project)){
+            def msg=g.message(code:'project.execution.disabled')
+            return [success:false,failed:true,error:'disabled',message:msg]
+        }
+
         if (!scheduledExecution.hasExecutionEnabled()) {
             def msg = g.message(code: 'scheduleExecution.execution.disabled')
             return [success: false, failed: true, error: 'disabled', message: msg]

rundeckapp/grails-app/domain/rundeck/Execution.groovy

@@ -144,6 +144,9 @@ class Execution extends ExecutionContext {
         withServerNodeUUID { uuid ->
             eq 'serverNodeUUID', uuid
         }
+        withProject{ project ->
+            eq 'project', project
+        }
 	}
 
 

rundeckapp/grails-app/domain/rundeck/ScheduledExecution.groovy

@@ -45,6 +45,8 @@ class ScheduledExecution extends ExecutionContext {
 
     Workflow workflow
 
+    def scheduledExecutionService
+
     Date nextExecution
     boolean scheduled = false
     Boolean nodesSelectedByDefault = true
@@ -183,6 +185,9 @@ class ScheduledExecution extends ExecutionContext {
 				eq 'status', 'scheduled'
 			}
 		}
+        withProject { project ->
+            eq 'project', project
+        }
     }
 
 
@@ -530,8 +535,12 @@ class ScheduledExecution extends ExecutionContext {
         return (null == scheduleEnabled || scheduleEnabled)
     }
 
+    def shouldScheduleExecutionProject(){
+        return scheduledExecutionService.shouldScheduleInThisProject(project)
+    }
+
     def boolean shouldScheduleExecution() {
-        return scheduled && hasExecutionEnabled() && hasScheduleEnabled();
+        return scheduled && hasExecutionEnabled() && hasScheduleEnabled()
     }
 
     def boolean hasExecutionEnabled() {

rundeckapp/grails-app/i18n/messages.properties

@@ -1450,4 +1450,7 @@ form.option.multivalueAllSelected.label=Select All Values by Default
 project.configuration.extra.category.gui.description=Additional configuration for the user interface for this project
 project.configuration.extra.category.gui.title=User Interface
 api.error.project.archive.failure=Project export request {0} failed: {1}
-scheduledExecution.action.duplicate.other.button.label=Duplicate this Job to other Project…
+project.passive.mode.description=Job execution and schedule configuration at project level.
+project.execution.disabled=Project execution is disabled
+project.schedule.disabled=Project schedule is disabled
+scheduledExecution.action.duplicate.other.button.label=Duplicate this Job to other Project…

rundeckapp/grails-app/i18n/messages_es_419.properties

@@ -909,7 +909,7 @@ page.admin.EditProjectConfigFile.button=Editar Archivo de Configuración
 page.admin.EditProjectConfigFile.title=Advanced\: Editar archivo de conf directamente
 invalid.resource.model.source.configuration.provider.not.found=Configuración de Modelo Fuente de Recursos no Válido\: Proveedor no encontrado\: {0}
 framework.service.NodeExecutor.default.label=Nodo Ejecutor por Defecto 
-framework.service.FileCopier.default.label=Copiadora de Archvivo Por Defecto
+framework.service.FileCopier.default.label=Copiadora de Archivo Por Defecto
 configuration.not.available=Configuración no disponible.
 download.an.archive.of.project.named.prompt=Descargar un archivo del proyecto <strong>{0}</strong>
 export.project.jar.button=Exportar {0}.rdproject.jar &hellip;
@@ -1446,4 +1446,6 @@ form.option.multivalueAllSelected.label=Select All Values by Default
 project.configuration.extra.category.gui.description=Additional configuration for the Jobs for this project
 project.configuration.extra.category.gui.title=User Interface
 api.error.project.archive.failure=Project export request {0} failed: {1}
-scheduledExecution.action.duplicate.other.button.label=Duplicar TRabajo a otro Projecto&hellip;
+project.passive.mode.description=Configuracion de ejecucion y programacion de tareas a nivel de proyecto.
+project.execution.disabled=Ejecucion deshabilitada a nivel de projecto.1
+scheduledExecution.action.duplicate.other.button.label=Duplicar Trabajo a otro Projecto&hellip;

rundeckapp/grails-app/jobs/rundeck/quartzjobs/ExecutionJob.groovy

@@ -292,7 +292,22 @@ class ExecutionJob implements InterruptableJob {
                     }
                 }
             }
+
             FrameworkService frameworkService = initMap.frameworkService
+            def project = initMap.scheduledExecution.project
+            def fwProject = frameworkService.getFrameworkProject(project)
+            def disableEx = fwProject.getProjectProperties().get("project.disable.executions")
+            def disableSe = fwProject.getProjectProperties().get("project.disable.schedule")
+            def isProjectExecutionEnabled = ((!disableEx)||disableEx.toLowerCase()!='true')
+            def isProjectScheduledEnabled = ((!disableSe)||disableSe.toLowerCase()!='true')
+
+            if(!(isProjectExecutionEnabled && isProjectScheduledEnabled)){
+                initMap.jobShouldNotRun = "Job ${initMap.scheduledExecution.extid} schedule has been disabled, removing schedule on this project (${initMap.scheduledExecution.project})."
+                context.getScheduler().deleteJob(context.jobDetail.key)
+                return initMap
+            }
+
+
             initMap.framework = frameworkService.rundeckFramework
             def rolelist = initMap.scheduledExecution.userRoles
             initMap.authContext = frameworkService.getAuthContextForUserAndRoles(initMap.scheduledExecution.user, rolelist)

rundeckapp/grails-app/services/rundeck/services/ExecutionService.groovy

@@ -1682,6 +1682,10 @@ class ExecutionService implements ApplicationContextAware, StepExecutor, NodeSte
             return [success:false,failed:true,error:'disabled',message:lookupMessage('disabled.execution.run',null)]
         }
 
+        if(!scheduledExecutionService.isProjectExecutionEnabled(scheduledExecution.project)){
+            return [success:false,failed:true,error:'disabled',message:lookupMessage('project.execution.disabled',null)]
+        }
+
         if (!scheduledExecution.hasExecutionEnabled()) {
             return [success:false,failed:true,error:'disabled',message:lookupMessage('scheduleExecution.execution.disabled',null)]
         }