From 4c9a74b72595c7599da4d2630eb737d5b6264894 Mon Sep 17 00:00:00 2001
From: Antoine <antoinroux@hotmail.fr>
Date: Tue, 18 Feb 2020 08:09:23 +0100
Subject: [PATCH] split ansible role

---
 packer/assets/ansible/playbook.yml            |   1 +
 .../roles/setup/tasks/.partition.yml.swp      | Bin 0 -> 12288 bytes
 .../assets/ansible/roles/setup/tasks/main.yml |  28 ++----------------
 .../ansible/roles/setup/tasks/partition.yml   |  15 +++-------
 .../ansible/roles/setup/tasks/security.yml    |  18 +++++++++++
 .../ansible/roles/setup/tasks/users.yml       |  13 ++++++++
 packer/assets/ansible/run-ansible.sh          |   5 ++++
 test.sh                                       |   4 ---
 8 files changed, 44 insertions(+), 40 deletions(-)
 create mode 100644 packer/assets/ansible/roles/setup/tasks/.partition.yml.swp
 create mode 100644 packer/assets/ansible/roles/setup/tasks/security.yml
 create mode 100644 packer/assets/ansible/roles/setup/tasks/users.yml
 create mode 100755 packer/assets/ansible/run-ansible.sh

diff --git a/packer/assets/ansible/playbook.yml b/packer/assets/ansible/playbook.yml
index 50c68ed..d958e08 100644
--- a/packer/assets/ansible/playbook.yml
+++ b/packer/assets/ansible/playbook.yml
@@ -14,4 +14,5 @@
         fail_msg: "Pass param ssh_pub, generated_user and generated_group to launch this playbook"
   roles:
      - prepare
+     - setup
 
diff --git a/packer/assets/ansible/roles/setup/tasks/.partition.yml.swp b/packer/assets/ansible/roles/setup/tasks/.partition.yml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..032ccc8376f03ec49900e6217d2725296e6ef9e4
GIT binary patch
literal 12288
zcmeI&yG{Z@6b9gfrSTSx)<>vexmcKOEsRl0DKwf4>;M~PFPRxYDqCN|+E>yiFusF@
zhXoU3p|QmLll&QG=Ire3mrxM4Tko8;`M6dmX*)!3`{%c#%>%kwC(2cCr0sm+=ca6L
zXySBy_j4Hqiwy&ny0~j}U^Am#;Itp-fmd$iq`>;v$5~pNCFYmiunYkR{7qn!TFplB
zRj-r}d2jdfZ<nJQ0uX=z1Rwwb2tWV=5LjsepO@%fo?vbH6dTLF^sQeG(Ln$L5P$##
zAOHafKmY;|fB*y_uz~_AB6{5-YHiEm<^TWB-~aD2evv#&o+OWw2gy`2lw3(pB}bC^
zwM_{c1Rwwb2tWV=5P$##AOHafK;S<Kur%kD*CFRtJDqx(PxXx&xR9^eOcK5+rqXfJ
z)i&ftF*2&FO~`|MQJ<<rb|~8{^W|ba(v!F+Q-OR4T%=@j{zANtLaOqz`owCvF)L2>
tRPG)p%Fc?a;<b71XO=HI?J`m2%WM?85&MkeRE}*759G*MM%8MSJ^*MqXfOZ(

literal 0
HcmV?d00001

diff --git a/packer/assets/ansible/roles/setup/tasks/main.yml b/packer/assets/ansible/roles/setup/tasks/main.yml
index 376ce12..5fe6b8c 100644
--- a/packer/assets/ansible/roles/setup/tasks/main.yml
+++ b/packer/assets/ansible/roles/setup/tasks/main.yml
@@ -1,29 +1,7 @@
 ---
 # setup gentoo
 
-- name: "Ensure group {{ generated_group }} exists"
-  group:
-    name: "{{ generated_group }}"
-
-- name: "create {{ generated_user }} user and {{ generated_group }} group"
-  user:
-    name: "{{ generated_user }}"
-    comment: "Login user generate by ansible"
-    group: "{{ generated_group }}"
-
-- name: "copy ssh key to {{ user_home }}/.ssh/authorized_keys"
-  lineinfile:
-    path: "{{ user_home }}/.ssh/authorized_keys"
-    line: "{{ ssh_pub }}"
-    create: yes
-    owner: "{{ generated_user }}"
-    group: "{{ generated_user }}"
-    mode: '0600'
-
-- name: Ensure SELinux is set to permissive mode
-  lineinfile:
-    path: /etc/selinux/config
-    regexp: '^SELINUX='
-    line: SELINUX=permissive
-
+- import_tasks: partition.yml
+  #- import_tasks: users.yml
+  #- import_tasks: security.yml
 
diff --git a/packer/assets/ansible/roles/setup/tasks/partition.yml b/packer/assets/ansible/roles/setup/tasks/partition.yml
index 2649122..e4206b4 100644
--- a/packer/assets/ansible/roles/setup/tasks/partition.yml
+++ b/packer/assets/ansible/roles/setup/tasks/partition.yml
@@ -1,19 +1,12 @@
 ---
 # partition disk to install gentoo
 
-- name: "Create a new primary partition with a size of 1GiB"
-  parted:
-    device: /dev/sdb
-    number: 1
-    state: present
-    part_end: 1GiB
-
 - name: "Create a new primary partition for LVM"
   parted:
-    device: /dev/sdb
-    number: 2
+    device: /dev/sda
+    name: "root"
+    label: gpt
+    number: 1
     flags: [ lvm ]
     state: present
-    part_start: 1GiB
-
 
diff --git a/packer/assets/ansible/roles/setup/tasks/security.yml b/packer/assets/ansible/roles/setup/tasks/security.yml
new file mode 100644
index 0000000..f5c8a5b
--- /dev/null
+++ b/packer/assets/ansible/roles/setup/tasks/security.yml
@@ -0,0 +1,18 @@
+---
+# setup gentoo
+
+- name: "copy ssh key to {{ user_home }}/.ssh/authorized_keys"
+  lineinfile:
+    path: "{{ user_home }}/.ssh/authorized_keys"
+    line: "{{ ssh_pub }}"
+    create: yes
+    owner: "{{ generated_user }}"
+    group: "{{ generated_user }}"
+    mode: '0600'
+
+- name: Ensure SELinux is set to permissive mode
+  lineinfile:
+    path: /etc/selinux/config
+    regexp: '^SELINUX='
+    line: SELINUX=permissive
+
diff --git a/packer/assets/ansible/roles/setup/tasks/users.yml b/packer/assets/ansible/roles/setup/tasks/users.yml
new file mode 100644
index 0000000..56de8b8
--- /dev/null
+++ b/packer/assets/ansible/roles/setup/tasks/users.yml
@@ -0,0 +1,13 @@
+---
+# create user and group
+
+- name: "Ensure group {{ generated_group }} exists"
+  group:
+    name: "{{ generated_group }}"
+
+- name: "create {{ generated_user }} user and {{ generated_group }} group"
+  user:
+    name: "{{ generated_user }}"
+    comment: "Login user generate by ansible"
+    group: "{{ generated_group }}"
+
diff --git a/packer/assets/ansible/run-ansible.sh b/packer/assets/ansible/run-ansible.sh
new file mode 100755
index 0000000..07d6b12
--- /dev/null
+++ b/packer/assets/ansible/run-ansible.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# run playbook on aready running qemu vm
+ansible-playbook -i inventory_test.ini playbook.yml --extra-vars "ssh_pub=$(cat ../id_rsa_qemu) generated_user=antoine generated_group=antoine"
+
diff --git a/test.sh b/test.sh
index 02054a9..a692c7c 100755
--- a/test.sh
+++ b/test.sh
@@ -8,7 +8,3 @@ qemu-system-x86_64 \
     -device virtio-net,netdev=user.0 \
     -netdev user,id=user.0,hostfwd=tcp::5556-:22
 
-
-# run playbook on aready running qemu vm
-# ansible-playbook -i inventory_test.ini playbook.yml --extra-vars "ssh_pub=$(cat ../id_rsa_qemu) geenrated_user=antoine generated_group=antoine"
-