diff --git a/config/20-sge.ini b/config/20-sge.ini index 52591e66..97a16ebb 100644 --- a/config/20-sge.ini +++ b/config/20-sge.ini @@ -29,20 +29,3 @@ sge_config = /etc/sysconfig/gridengine ; The sge_bin_location setting should be set to the location where your ; SGE binaries are located, this is a required setting sge_bin_location = UNAVAILABLE - -; This option sets the queue that incoming jobs will be sent to by default. -; If this is not set, jobs will be sent to the queue that is set in your SGE -; settings -; default_queue = UNAVAILABLE - -; If this option is set to True then the job manager will attempt to verify that -; incoming jobs specify a valid queue. If this is set, then you must -; set the available_queues option as well -; This is set to False by default -; validate_queues = False - -; This option tells globus which queues are available on your SGE cluster. -; This option is used in conjunction with the validate_queues option to -; verify that jobs are being sent to a queue that exists on your SGE -; cluster -; available_queues = UNAVAILABLE diff --git a/osg_configure/configure_modules/sge.py b/osg_configure/configure_modules/sge.py index ffe65b2a..c48e4265 100644 --- a/osg_configure/configure_modules/sge.py +++ b/osg_configure/configure_modules/sge.py @@ -34,20 +34,7 @@ def __init__(self, *args, **kwargs): default_value='/etc/sysconfig/gridengine'), 'sge_bin_location': configfile.Option(name='sge_bin_location', - default_value='default'), - 'default_queue': - configfile.Option(name='default_queue', - required=configfile.Option.OPTIONAL, - default_value=''), - 'validate_queues': - configfile.Option(name='validate_queues', - required=configfile.Option.OPTIONAL, - opt_type=bool, - default_value=False), - 'available_queues': - configfile.Option(name='available_queues', - required=configfile.Option.OPTIONAL, - default_value='')} + default_value='default')} self.config_section = "SGE" self.log('SGEConfiguration.__init__ completed') @@ -70,7 +57,8 @@ def parse_configuration(self, configuration): self.log('SGEConfiguration.parse_configuration completed') return True - self.get_options(configuration, ignore_options=['enabled']) + self.get_options(configuration, ignore_options=['enabled', 'default_queue', 'validate_queues', + 'available_queues']) # fill in values for sge_location and home self.options['job_manager'] = configfile.Option(name='job_manager',