From 0def1a55cae061b193878ea680b8ccc6fc35f39b Mon Sep 17 00:00:00 2001 From: Mohammed AbuAisha Date: Mon, 29 Jul 2019 16:37:55 +0300 Subject: [PATCH] CY-1545 Add extra status for pending status when delete ec2 instance --- CHANGELOG.txt | 2 ++ cloudify_aws/ec2/resources/instances.py | 2 +- plugin.yaml | 4 ++-- setup.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6226e8f1..d6e7e00b 100644 --- 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 index 315934ca..b9ae01ee 100644 --- 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 index 65f04bfc..d342b835 100644 --- 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 index 7c7092d4..34b880f3 100644 --- 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='hello@cloudify.co', license='LICENSE',