Merge pull request #334 from cloudify-cosmo/fix-bug-2.5.10

fix bug in attach

.circleci/update_test_manager.py

@@ -0,0 +1,12 @@
+from os import path, pardir
+from ecosystem_tests.dorkl import replace_plugin_package_on_manager
+from ecosystem_cicd_tools.validations import validate_plugin_version
+
+abs_path = path.join(
+    path.abspath(path.join(path.dirname(__file__), pardir)))
+
+if __name__ == '__main__':
+    version = validate_plugin_version(abs_path)
+    for package in ['cloudify_aws']:
+        replace_plugin_package_on_manager(
+            'cloudify-aws-plugin', version, package, )

CHANGELOG.txt

@@ -114,3 +114,5 @@
     - Allow resources with null state to retry before fatal error in order to compensate for async lag.
 2.5.10:
     - Fix bug in attach from 2.5.9
+2.5.11:
+    - Fix bug in attach from 2.5.10

cloudify_aws/ec2/resources/elasticip.py

@@ -267,7 +267,7 @@ def attach(ctx, iface, resource_config, **_):
     skip_attach = ctx.node.properties.get('use_external_resource', False) and \
         not ctx.node.properties.get('attach_existing_address', False)
 
-    if not skip_attach:
+    if skip_attach:
         return
     # Actually attach the resources
     association_id = iface.attach(params)
@@ -302,6 +302,6 @@ def detach(ctx, iface, resource_config, **_):
     skip_attach = ctx.node.properties.get('use_external_resource', False) and \
         not ctx.node.properties.get('attach_existing_address', False)
 
-    if not skip_attach:
+    if skip_attach:
         return
     iface.detach(params)

plugin.yaml

@@ -2,9 +2,9 @@ plugins:
 
   aws:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.5.10.zip
+    source: https://github.com/cloudify-cosmo/cloudify-aws-plugin/archive/2.5.11.zip
     package_name: cloudify-aws-plugin
-    package_version: '2.5.10'
+    package_version: '2.5.11'
 
 data_types: