Merge remote-tracking branch 'upstream/master' into update-master-XXX

Author: sanderegg

.env-devel

@@ -70,11 +70,17 @@ DASK_TLS_CA_FILE=/home/scu/.dask/dask-crt.pem
 DASK_TLS_CERT=/home/scu/.dask/dask-crt.pem
 DASK_TLS_KEY=/home/scu/.dask/dask-key.pem
 
+DIRECTOR_DEFAULT_MAX_MEMORY=2147483648
+DIRECTOR_DEFAULT_MAX_NANO_CPUS=1000000000
 DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
 DIRECTOR_HOST=director
-DIRECTOR_PORT=8080
-DIRECTOR_REGISTRY_CACHING_TTL=900
+DIRECTOR_LOGLEVEL=INFO
+DIRECTOR_MONITORING_ENABLED=True
+DIRECTOR_PORT=8000
+DIRECTOR_PUBLISHED_HOST_NAME="127.0.0.1:9081"
+DIRECTOR_REGISTRY_CACHING_TTL=00:15:00
 DIRECTOR_REGISTRY_CACHING=True
+DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=null
 DIRECTOR_TRACING={}
 
 EFS_USER_ID=8006
@@ -186,6 +192,7 @@ REDIS_SECURE=false
 REDIS_USER=null
 
 REGISTRY_AUTH=True
+REGISTRY_PATH=""
 REGISTRY_PW=adminadminadmin
 REGISTRY_SSL=True
 REGISTRY_URL=registry.osparc-master.speag.com