From 13b3df9321271c7aa073324ba567d1627554076c Mon Sep 17 00:00:00 2001
From: Christian Barra <barrachri@gmail.com>
Date: Fri, 23 Mar 2018 06:59:29 +0100
Subject: [PATCH] Check if the provider is external before getting the config.
 (#1743)

---
 python/ray/autoscaler/docker.py        |  2 ++
 python/ray/autoscaler/node_provider.py | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/python/ray/autoscaler/docker.py b/python/ray/autoscaler/docker.py
index f126681ba..e394dbaca 100644
--- a/python/ray/autoscaler/docker.py
+++ b/python/ray/autoscaler/docker.py
@@ -10,6 +10,8 @@ except ImportError:  # py2
 
 
 def dockerize_if_needed(config):
+    if "docker" not in config:
+        return config
     docker_image = config["docker"].get("image")
     cname = config["docker"].get("container_name")
     if not docker_image:
diff --git a/python/ray/autoscaler/node_provider.py b/python/ray/autoscaler/node_provider.py
index b3f2796f4..0189cc1c1 100644
--- a/python/ray/autoscaler/node_provider.py
+++ b/python/ray/autoscaler/node_provider.py
@@ -19,6 +19,13 @@ def load_aws_config():
         ray_aws.__file__), "example-full.yaml")
 
 
+def import_external():
+    """Mock a normal provider importer."""
+    def return_it_back(config):
+        return config
+    return return_it_back, None
+
+
 NODE_PROVIDERS = {
     "aws": import_aws,
     "gce": None,  # TODO: support more node providers
@@ -26,7 +33,7 @@ NODE_PROVIDERS = {
     "kubernetes": None,
     "docker": None,
     "local_cluster": None,
-    "external": None,  # Import an external module
+    "external": import_external  # Import an external module
 }
 
 DEFAULT_CONFIGS = {
@@ -71,6 +78,8 @@ def get_node_provider(provider_config, cluster_name):
 
 
 def get_default_config(provider_config):
+    if provider_config["type"] == "external":
+        return {}
     load_config = DEFAULT_CONFIGS.get(provider_config["type"])
     if load_config is None:
         raise NotImplementedError(