Merge pull request #106 from cloudify-cosmo/RD-7159-Fix-Docker-Install

RD-7159-Fix-Docker-Install

CHANGELOG.txt

@@ -25,4 +25,6 @@
 2.0.10:
   - Fix get api due to back-compat issue.
 2.0.11:
-  - add __version__.py file in cloudify_docker folder.
+  - add __version__.py file in cloudify_docker folder.
+2.0.12:
+  - fix install config for docker host.

cloudify_docker/__version__.py

@@ -1 +1 @@
-version = '2.0.11'
+version = '2.0.12'

cloudify_docker/tasks.py

@@ -564,8 +564,12 @@ def list_images(ctx, docker_client, **kwargs):
 def install_docker(ctx, **kwargs):
     # fetch the data needed for installation
     docker_ip, docker_user, docker_key, _ = get_docker_machine_from_ctx(ctx)
-    install_url = ctx.node.properties.get('install_url')
-    post_install_url = ctx.node.properties.get('install_script')
+    resource_config = ctx.node.properties.get('resource_config', {})
+    install_url = resource_config.get('install_url')
+    post_install_url = resource_config.get('install_script')
+
+    if not (install_url and post_install_url):
+        raise NonRecoverableError("Please validate your install config")
 
     with get_fabric_settings(ctx, docker_ip, docker_user, docker_key) as s:
         with s:

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.11'
+    package_version: '2.0.12'
 
 dsl_definitions:
 

plugin_1_4.yaml

@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.11'
+    package_version: '2.0.12'
 
 dsl_definitions:
 

v2_plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   docker:
     executor: central_deployment_agent
     package_name: 'cloudify-docker-plugin'
-    package_version: '2.0.11'
+    package_version: '2.0.12'
 
 dsl_definitions: