diff --git a/dask_jobqueue/core.py b/dask_jobqueue/core.py index cd4219d7..7a973882 100644 --- a/dask_jobqueue/core.py +++ b/dask_jobqueue/core.py @@ -450,7 +450,7 @@ def __init__( scheduler_cls=Scheduler, # Use local scheduler for now # Options for both scheduler and workers interface=None, - protocol="tcp://", + protocol=None, # Job keywords config_name=None, **job_kwargs @@ -500,6 +500,9 @@ def __init__( "jobqueue.%s.scheduler-options" % config_name, {} ) + if protocol is None and security is not None: + protocol = "tls://" + default_scheduler_options = { "protocol": protocol, "dashboard_address": ":8787", diff --git a/dask_jobqueue/tests/test_jobqueue_core.py b/dask_jobqueue/tests/test_jobqueue_core.py index 3290e94b..b616392c 100644 --- a/dask_jobqueue/tests/test_jobqueue_core.py +++ b/dask_jobqueue/tests/test_jobqueue_core.py @@ -433,6 +433,7 @@ def test_security(): assert cluster.security == security assert cluster.scheduler_spec["options"]["security"] == security job_script = cluster.job_script() + assert "tls://" in job_script assert "--tls-key {}".format(key) in job_script assert "--tls-cert {}".format(cert) in job_script assert "--tls-ca-file {}".format(cert) in job_script @@ -442,3 +443,6 @@ def test_security(): future = client.submit(lambda x: x + 1, 10) result = future.result() assert result == 11 + + with LocalCluster(cores=1, memory="1GB", security=security) as cluster: + assert "tls://" in job_script