Skip to content

Commit

Permalink
Merge pull request #276 from cloudify-cosmo/CY-1545-add-extra-status-…
Browse files Browse the repository at this point in the history
…on-delete-ec2-operation

CY-1545 Add extra status for pending status when delete ec2 instance
  • Loading branch information
EarthmanT authored Jul 30, 2019
2 parents 8aca56e + 0def1a5 commit 0145371
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cloudify_aws/ec2/resources/instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'''
Expand Down
4 changes: 2 additions & 2 deletions plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 0145371

Please sign in to comment.