CY-1545 Add extra status for pending status when delete ec2 instance

cloudify-cosmo · Jul 29, 2019 · 0def1a5 · 0def1a5
1 parent 8aca56e
commit 0def1a5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -63,3 +63,5 @@
     - Make Resource Naming Resolution consistent across the plugin.
 2.2.0:
     - Add resumable support to operations
+2.2.1:
+    - Fix bug when delete EC2 instance
diff --git a/cloudify_aws/ec2/resources/instances.py b/cloudify_aws/ec2/resources/instances.py
@@ -357,7 +357,7 @@ def stop(ctx, iface, resource_config, **_):
 @decorators.aws_resource(EC2Instances, RESOURCE_TYPE)
 @decorators.wait_for_delete(
     status_deleted=[TERMINATED],
-    status_pending=[PENDING, STOPPING, SHUTTING_DOWN])
+    status_pending=[PENDING, STOPPING, STOPPED, SHUTTING_DOWN])
 @decorators.untag_resources
 def delete(iface, resource_config, **_):
     '''Deletes AWS EC2 Instances'''

diff --git a/plugin.yaml b/plugin.yaml
@@ -2,9 +2,9 @@ plugins:
 
   aws:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.2.0.zip
+    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/CY-1545-add-extra-status-on-delete-ec2-operation.zip
     package_name: cloudify-aws-plugin
-    package_version: '2.2.0'
+    package_version: '2.2.1'
 
 data_types:
 

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 
 setup(
     name='cloudify-aws-plugin',
-    version='2.2.0',
+    version='2.2.1',
     author='Cloudify Platform Ltd.',
     author_email='[email protected]',
     license='LICENSE',