From 4601dae563199ec389925e356b91aa609a688bd2 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 21 Nov 2017 14:56:45 +0100
Subject: [PATCH] split amazon-ec2 tasks (cherry-pick)

---
 amazon-ec2/README                    |  1 +
 amazon-ec2/amazon-ec2-evolinux.yml   |  3 +++
 amazon-ec2/tasks/create-instance.yml | 20 --------------------
 amazon-ec2/tasks/setup.yml           | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 amazon-ec2/tasks/setup.yml

diff --git a/amazon-ec2/README b/amazon-ec2/README
index 80442d05..15f8b129 100644
--- a/amazon-ec2/README
+++ b/amazon-ec2/README
@@ -14,6 +14,7 @@ machine and an Amazon security access key pair created for your account.
 
 By default, this role does nothing (no `main.yml` file).
 
+* `setup.yml`: create a security group and ssh keys
 * `create-instance.yml`: create new EC2 instances
 * `post-install.yml`: remove admin user created on Debian instances
 
diff --git a/amazon-ec2/amazon-ec2-evolinux.yml b/amazon-ec2/amazon-ec2-evolinux.yml
index 282b8353..5c7a5e4e 100644
--- a/amazon-ec2/amazon-ec2-evolinux.yml
+++ b/amazon-ec2/amazon-ec2-evolinux.yml
@@ -9,6 +9,9 @@
     aws_region: ca-central-1
 
   tasks:
+    - include_role:
+        name: amazon-ec2
+        tasks_from: setup.yml
     - include_role:
         name: amazon-ec2
         tasks_from: create-instance.yml
diff --git a/amazon-ec2/tasks/create-instance.yml b/amazon-ec2/tasks/create-instance.yml
index 8b337194..470cac72 100644
--- a/amazon-ec2/tasks/create-instance.yml
+++ b/amazon-ec2/tasks/create-instance.yml
@@ -1,24 +1,4 @@
 ---
-- name: Create default security group
-  ec2_group:
-    name: "{{ec2_security_group.name}}"
-    state: present
-    aws_access_key: "{{aws_access_key}}"
-    aws_secret_key: "{{aws_secret_key}}"
-    region: "{{aws_region}}"
-    description: "{{ec2_security_group.description}}"
-    rules: "{{ec2_security_group.rules}}"
-    rules_egress: "{{ec2_security_group.rules_egress}}"
-
-- name: Create key pair
-  ec2_key:
-    name: "{{ec2_keyname}}"
-    state: present
-    aws_access_key: "{{aws_access_key}}"
-    aws_secret_key: "{{aws_secret_key}}"
-    region: "{{aws_region}}"
-    key_material: "{{item}}"
-  with_file: "{{ssh_pubkey_file}}"
 
 - name: Launch new instance(s)
   ec2:
diff --git a/amazon-ec2/tasks/setup.yml b/amazon-ec2/tasks/setup.yml
new file mode 100644
index 00000000..3a6f5b2d
--- /dev/null
+++ b/amazon-ec2/tasks/setup.yml
@@ -0,0 +1,22 @@
+---
+
+- name: Create default security group
+  ec2_group:
+    name: "{{ec2_security_group.name}}"
+    state: present
+    aws_access_key: "{{aws_access_key}}"
+    aws_secret_key: "{{aws_secret_key}}"
+    region: "{{aws_region}}"
+    description: "{{ec2_security_group.description}}"
+    rules: "{{ec2_security_group.rules}}"
+    rules_egress: "{{ec2_security_group.rules_egress}}"
+
+- name: Create key pair
+  ec2_key:
+    name: "{{ec2_keyname}}"
+    state: present
+    aws_access_key: "{{aws_access_key}}"
+    aws_secret_key: "{{aws_secret_key}}"
+    region: "{{aws_region}}"
+    key_material: "{{item}}"
+  with_file: "{{ssh_pubkey_file}}"