small-adjustments

cloudify-cosmo · Jun 21, 2023 · 9c345e7 · 9c345e7
1 parent 37d86c9
commit 9c345e7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -29,5 +29,5 @@
 2.0.12:
   - fix install config for docker host.
 2.0.13:
-  - Add PullImage Node type.
-  - Allow docker installation without sudo.
+  - Add PullImage support.
+  - Allow docker installation without sudo and offline.
diff --git a/cloudify_docker/__version__.py b/cloudify_docker/__version__.py
@@ -1 +1 @@
-version = '2.0.12'
+version = '2.0.13'
diff --git a/cloudify_docker/tasks.py b/cloudify_docker/tasks.py
@@ -1192,4 +1192,3 @@ def remove_container(ctx, docker_client, **kwargs):
         remove_res = container_obj.remove()
         ctx.instance.runtime_properties.pop('container')
         ctx.logger.info("Remove result {0}".format(remove_res))
-
diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml
@@ -230,17 +230,6 @@ data_types:
         description: Pull all tags (only if pull_image is True)
         default: false
 
-  cloudify.types.docker.PullImage:
-    properties:
-      tag:
-        description: Docker image tag
-        type: string
-        default: ''
-      all_tags:
-        type: boolean
-        description: Pull all tags
-        default: false
-
   cloudify.types.docker.Container:
     properties:
       image_tag:
@@ -376,21 +365,6 @@ node_types:
         delete:
           implementation: docker.cloudify_docker.tasks.remove_image
 
-  cloudify.nodes.docker.pullimage:
-    derived_from: cloudify.nodes.Root
-    properties:
-      <<: *client_config
-      resource_config:
-        type: cloudify.types.docker.PullImage
-        description: Docker Image type
-        required: true
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        create:
-          implementation: docker.cloudify_docker.tasks.pull_image
-        delete:
-          implementation: docker.cloudify_docker.tasks.remove_image
-
   cloudify.nodes.docker.container:
     derived_from: cloudify.nodes.Root
     properties:

diff --git a/v2_plugin.yaml b/v2_plugin.yaml
@@ -230,17 +230,6 @@ data_types:
         description: Pull all tags (only if pull_image is True)
         default: false
 
-  cloudify.types.docker.PullImage:
-    properties:
-      tag:
-        description: Docker image tag
-        type: string
-        default: ''
-      all_tags:
-        type: boolean
-        description: Pull all tags
-        default: false
-
   cloudify.types.docker.Container:
     properties:
       image_tag:
@@ -376,21 +365,6 @@ node_types:
         delete:
           implementation: docker.cloudify_docker.tasks.remove_image
 
-  cloudify.nodes.docker.pullimage:
-    derived_from: cloudify.nodes.Root
-    properties:
-      <<: *client_config
-      resource_config:
-        type: cloudify.types.docker.PullImage
-        description: Docker Image type
-        required: true
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        create:
-          implementation: docker.cloudify_docker.tasks.pull_image
-        delete:
-          implementation: docker.cloudify_docker.tasks.remove_image
-
   cloudify.nodes.docker.container:
     derived_from: cloudify.nodes.Root
     properties: