Fix resource mapping for Docker

resource_mapping() always returns all existing resource names and
their classes. available_resource_mapping() takes the dependencies
into account and only returns the ones whose dependencies have been
met.

Co-Authored-By: Richard Lee <rblee88@gmail.com>
Partial-Bug: #1271226
Change-Id: I3d785d92f1d30a3caf4cb0f7721c66c9dda294c3

1 files changed, 8 insertions, 5 deletions

diff --git a/contrib/docker/resources/docker_container.py b/contrib/docker/resources/docker_container.py
index 84b182be1..a081ad88d 100644
--- a/contrib/docker/resources/docker_container.py
+++ b/contrib/docker/resources/docker_container.py
@@ -272,11 +272,14 @@ class DockerContainer(resource.Resource):
 
 
 def resource_mapping():
-    # only register if docker client installed
+    return {
+        'OS::Docker::Container': DockerContainer,
+    }
+
+
+def available_resource_mapping():
     if DOCKER_INSTALLED:
-        return {
-            'OS::Docker::Container': DockerContainer
-        }
+        return resource_mapping()
     else:
         logger.warn("Docker plug-in loaded, but docker lib not installed.")
-    return {}
+        return {}