Allow the definition of the IP when creating a new host

tasks/ec2/inithost.yml

@@ -26,18 +26,22 @@
     state: running
     wait: yes
 
-- name: "Add new instance(s) to the inventory"
-  add_host:
-    hostname="{{ host }}"
-    static_ipv4="{{ item.public_ip }}"
-    groups="{{ initgroups }}"
-  with_items: '{{ ec2.instances }}'
+- block:
+
+  - name: "Associate an elastic IP with the new instance"
+    ec2_eip:
+      device_id: "{{ item }}"
+      public_ip: '{{ inithostip }}'
+      region: "{{ ec2_region }}"
+      state: present
+    with_items: '{{ ec2.instance_ids }}'
+
+  - include: inithostip.yml hostip='{{ inithostip }}'
+
+  when: inithostip is defined
 
-- name: "Waiting for SSH service becoming available"
-  wait_for:
-    host="{{ item.public_ip }}"
-    port=22
-    delay=10
-    timeout=120
-    state=present
+- include: inithostip.yml hostip='{{ ec2instance.public_ip }}'
   with_items: '{{ ec2.instances }}'
+  loop_control:
+    loop_var: ec2instance
+  when: inithostip is not defined

tasks/ec2/inithostip.yml

+---
+# file: ec2/inithostip.yml
+
+- name: "Add new instance(s) to the inventory"
+  add_host:
+    hostname="{{ host }}"
+    static_ipv4="{{ hostip }}"
+    groups="{{ initgroups }}"
+
+- name: "Waiting for SSH service becoming available"
+  wait_for:
+    host="{{ hostip }}"
+    port=22
+    delay=10
+    timeout=120
+    state=present