diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 719ec89..5b81fac 100644 --- a/CHANGELOG.txt +++ b/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. \ No newline at end of file + - add __version__.py file in cloudify_docker folder. +2.0.12: + - fix install config for docker host. \ No newline at end of file diff --git a/cloudify_docker/__version__.py b/cloudify_docker/__version__.py index c26620a..f1af94f 100644 --- a/cloudify_docker/__version__.py +++ b/cloudify_docker/__version__.py @@ -1 +1 @@ -version = '2.0.11' +version = '2.0.12' diff --git a/cloudify_docker/tasks.py b/cloudify_docker/tasks.py index 3e7832d..38d0e42 100644 --- a/cloudify_docker/tasks.py +++ b/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: diff --git a/plugin.yaml b/plugin.yaml index 0b32a41..24bb883 100644 --- a/plugin.yaml +++ b/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: diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml index b91f869..fd6b45f 100644 --- a/plugin_1_4.yaml +++ b/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: diff --git a/v2_plugin.yaml b/v2_plugin.yaml index b91f869..fd6b45f 100644 --- a/v2_plugin.yaml +++ b/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: