Merge branch '2.7.1-build'

Author: earthmant

CHANGELOG.txt

@@ -1,3 +1,6 @@
+2.7.1:
+  - Remove tagging for EIP as it is not supported.
+  - Add use_ipv6_ip property to compute.
 2.7.0: Add Tag property/runtime property/operation input for EC2 resource node templates (without the previously only available Tagging node type): Customer Gateway, Volumes, Elastic IPs, Elastic Network Interfaces, Instances, Internet Gateways, Keypairs, NAT Gateways, Network ACLs, Route Tables, Security Groups, Subnets, VPCs, VPC Peerings, and VPN Gateways.
 2.6.0:
   - Add Modify VPC Attribute

cloudify_awssdk/ec2/resources/elasticip.py

@@ -105,7 +105,6 @@ def prepare(ctx, resource_config, **_):
 
 
 @decorators.aws_resource(EC2ElasticIP, RESOURCE_TYPE)
-@decorators.tag_resources
 def create(ctx, iface, resource_config, **_):
     """Creates an AWS EC2 ElasticIP"""
 
@@ -126,7 +125,6 @@ def create(ctx, iface, resource_config, **_):
 
 @decorators.aws_resource(EC2ElasticIP, RESOURCE_TYPE,
                          ignore_properties=True)
-@decorators.untag_resources
 def delete(ctx, iface, resource_config, **_):
     """Deletes an AWS EC2 ElasticIP"""
 

cloudify_awssdk/ec2/resources/instances.py

@@ -288,7 +288,11 @@ def assign_ip_properties(_ctx, current_properties):
                 ipv6_addresses.append(_nic_ipv6)
 
     _ctx.instance.runtime_properties['ipv4_addresses'] = ipv4_addresses
-    _ctx.instance.runtime_properties['ipv6_addresses'] = ipv6_addresses
+    ipv6_addr_list = []
+    for ipv6_addr in ipv6_addresses:
+        if isinstance(ipv6_addr, dict) and ipv6_addr.get('Ipv6Address'):
+            ipv6_addr_list.append(ipv6_addr['Ipv6Address'])
+    _ctx.instance.runtime_properties['ipv6_addresses'] = ipv6_addr_list
 
     if len(ipv4_addresses) > 0 and \
             not _ctx.instance.runtime_properties.get('ipv4_address'):
@@ -304,6 +308,9 @@ def assign_ip_properties(_ctx, current_properties):
     if ctx.node.properties['use_public_ip']:
         _ctx.instance.runtime_properties['ip'] = pip
         _ctx.instance.runtime_properties['public_ip_address'] = pip
+    elif ctx.node.properties.get('use_ipv6_ip', False) and ipv6_addresses:
+        _ctx.instance.runtime_properties['ip'] = ipv6_addresses[0]
+        _ctx.instance.runtime_properties['public_ip_address'] = pip
     else:
         _ctx.instance.runtime_properties['ip'] = ip
         _ctx.instance.runtime_properties['public_ip_address'] = pip

plugin.yaml

@@ -2,9 +2,9 @@ plugins:
 
   awssdk:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-incubator/cloudify-awssdk-plugin/archive/2.7.0.zip
+    source: https://github.com/cloudify-incubator/cloudify-awssdk-plugin/archive/2.7.1.zip
     package_name: cloudify-awssdk-plugin
-    package_version: '2.7.0'
+    package_version: '2.7.1'
 
 data_types:
 
@@ -1860,6 +1860,11 @@ node_types:
           Boto3 method. Key names must match the case that Boto3 requires.
         type: cloudify.datatypes.aws.ec2.Instances.config
         required: false
+      use_ipv6_ip:
+        type: boolean
+        description: >
+          Tells us to use the IPv6 IP if one exists for agent installation. If use_public_ip is provided, this is overridden.
+        default: false
       use_public_ip:
         type: boolean
         description: >
@@ -1933,8 +1938,11 @@ node_types:
           inputs: *operation_inputs
 
   cloudify.nodes.aws.ec2.ElasticIP:
-    derived_from: cloudify.nodes.aws.ec2.BaseType
+    derived_from: cloudify.nodes.Root
     properties:
+      <<: *external_resource
+      <<: *client_config
+      <<: *resource_id
       resource_config:
         description: >
           Configuration key-value data to be passed as-is to the corresponding

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='cloudify-awssdk-plugin',
-    version='2.7.0',
+    version='2.7.1',
     license='LICENSE',
     packages=find_packages(exclude=['tests*']),
     description='A Cloudify plugin for AWS',

test-requirements.txt

@@ -1,4 +1,4 @@
-flake8
+flake8==3.5.0
 mock>=1.0
 nose-testconfig>=0.9
 nose>=1.3