Move to the native module. Add additional condition for existing Elastic IP

config.cfg

@@ -134,6 +134,9 @@ cloud_providers:
     # Change the encrypted flag to "true" to enable AWS volume encryption, for encryption of data at rest.
     # Warning: the Algo script will take approximately 6 minutes longer to complete.
     encrypted: false
+    # Set use_existing_eip to "true" if you want to use a pre-allocated Elastic IP
+    # Additional prompt will be raised to determine which IP to use
+    use_existing_eip: true
     size: t2.micro
     image:
       name: "ubuntu-bionic-18.04"

library/ec2_elasticip_facts.py

@@ -1,122 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-#
-# backported from Ansible 2.6. This can be removed and replaced with the
-# ec2_eip_facts module after upgrading to Ansible 2.6
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = '''
----
-module: ec2_elasticip_facts
-short_description: List EC2 EIP details
-description:
-    - List details of EC2 Elastic IP addresses.
-version_added: "2.6"
-author: "Brad Macpherson (@iiibrad)"
-options:
-  filters:
-    description:
-      - A set of filters to use. Each filter is a name:value pair. The value
-        may be a list or a single element.
-    required: false
-    default: {}
-extends_documentation_fragment:
-    - aws
-    - ec2
-'''
-
-EXAMPLES = '''
-# Note: These examples do not set authentication details or the AWS region,
-# see the AWS Guide for details.
-
-# List all EIP addresses in the current region.
-- ec2_elasticip_facts:
-  register: regional_eip_addresses
-
-# List all EIP addresses for a VM.
-- ec2_elasticip_facts:
-    filters:
-       instance-id: i-123456789
-  register: my_vm_eips
-
-- debug: msg="{{ my_vm_eips.addresses | json_query(\"[?private_ip_address=='10.0.0.5']\") }}"
-
-# List all EIP addresses for several VMs.
-- ec2_elasticip_facts:
-    filters:
-       instance-id:
-         - i-123456789
-         - i-987654321
-  register: my_vms_eips
-
-'''
-
-
-RETURN = '''
-addresses:
-  description: Properties of all Elastic IP addresses matching the provided filters. Each element is a dict with all the information related to an EIP.
-  returned: on success
-  type: list
-  sample: [{
-        "allocation_id": "eipalloc-64de1b01",
-        "association_id": "eipassoc-0fe9ce90d6e983e97",
-        "domain": "vpc",
-        "instance_id": "i-01020cfeb25b0c84f",
-        "network_interface_id": "eni-02fdeadfd4beef9323b",
-        "network_interface_owner_id": "0123456789",
-        "private_ip_address": "10.0.0.1",
-        "public_ip": "54.81.104.1",
-        "tags": {
-            "Name": "test-vm-54.81.104.1"
-        }
-    }]
-
-'''
-
-from ansible.module_utils.aws.core import AnsibleAWSModule
-from ansible.module_utils.ec2 import (ansible_dict_to_boto3_filter_list,
-                                      boto3_tag_list_to_ansible_dict,
-                                      camel_dict_to_snake_dict)
-try:
-    from botocore.exceptions import (BotoCoreError, ClientError)
-except ImportError:
-    pass  # caught by imported AnsibleAWSModule
-
-
-def get_eips_details(module):
-    connection = module.client('ec2')
-    filters = module.params.get("filters")
-    try:
-        response = connection.describe_addresses(
-            Filters=ansible_dict_to_boto3_filter_list(filters)
-        )
-    except (BotoCoreError, ClientError) as e:
-        module.fail_json_aws(
-            e,
-            msg="Error retrieving EIPs")
-
-    addresses = camel_dict_to_snake_dict(response)['addresses']
-    for address in addresses:
-        if 'tags' in address:
-            address['tags'] = boto3_tag_list_to_ansible_dict(address['tags'])
-    return addresses
-
-
-def main():
-    module = AnsibleAWSModule(
-        argument_spec=dict(
-            filters=dict(type='dict', default={})
-        ),
-        supports_check_mode=True
-    )
-
-    module.exit_json(changed=False, addresses=get_eips_details(module))
-
-
-if __name__ == '__main__':
-    main()

roles/cloud-ec2/defaults/main.yml

@@ -5,3 +5,4 @@ ec2_vpc_nets:
   cidr_block: 172.16.0.0/16
   subnet_cidr: 172.16.254.0/23
 ec2_venv: "{{ playbook_dir }}/configs/.venvs/aws"
+existing_eip: ""

roles/cloud-ec2/tasks/cloudformation.yml

@@ -12,7 +12,7 @@
       PublicSSHKeyParameter: "{{ lookup('file', SSH_keys.public) }}"
       ImageIdParameter: "{{ ami_image }}"
       WireGuardPort: "{{ wireguard_port }}"
-      UseThisElasticIP: "{{ use_existing_eip }}"
+      UseThisElasticIP: "{{ existing_eip }}"
     tags:
       Environment: Algo
   register: stack

roles/cloud-ec2/tasks/prompts.yml

@@ -56,25 +56,22 @@
 
 - block:
   - name: Get existing available Elastic IPs
-    ec2_elasticip_facts:
+    ec2_eip_facts:
     register: raw_eip_addresses
 
   - set_fact:
       available_eip_addresses: "{{ raw_eip_addresses.addresses | selectattr('association_id', 'undefined') | list }}"
 
   - pause:
-      prompt: |
+      prompt: >-
-        Do you want to use a pre-allocated Elastic IP?
+        What Elastic IP would you like to use?
-        (leave blank to allocate a new IP)
           {% for eip in available_eip_addresses %}
           {{ loop.index }}. {{ eip['public_ip'] }}
           {% endfor %}
-          ['']
+
+        Enter the number of your desired Elastic IP
     register: _use_existing_eip
 
   - set_fact:
-      use_existing_eip: >-
+      existing_eip: "{{ available_eip_addresses[_use_existing_eip.user_input | int -1 ]['allocation_id'] }}"
-        {% if _use_existing_eip.user_input is defined and _algo_region.user_input != "" %}
+  when: cloud_providers.ec2.use_existing_eip
-        {{ available_eip_addresses[_use_existing_eip.user_input | int -1 ]['allocation_id'] }}
-        {%- else %}{% endif %}
-  when: use_existing_eip