From fa07cc9435623a5d1dc81ebb1f3a5c77da97e6fe Mon Sep 17 00:00:00 2001
From: Antoine <antoinroux@hotmail.fr>
Date: Sun, 24 Jan 2021 21:10:01 +0100
Subject: [PATCH] Add python3-docker package to vm

---
 Makefile                                                 | 4 ++--
 image/assets/ansible/roles/debian-init/defaults/main.yml | 2 +-
 image/assets/ansible/roles/debian-init/handlers/main.yml | 2 +-
 image/assets/hcl/source-debian.pkr.hcl                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6b6d3dc..4b50ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 
 include .env
 
-up-gentoo: imagePackerBuilder image/assets/id_rsa_qemu
+gentoo-up: imagePackerBuilder image/assets/id_rsa_qemu
 	docker-compose up --build -d gentoo_packer
 
-up-debian: imagePackerBuilder image/assets/id_rsa_qemu
+debian-up: imagePackerBuilder image/assets/id_rsa_qemu
 	docker-compose up --build -d debian_packer
 
 exec-gentoo:
diff --git a/image/assets/ansible/roles/debian-init/defaults/main.yml b/image/assets/ansible/roles/debian-init/defaults/main.yml
index 30e5eab..4e777ac 100644
--- a/image/assets/ansible/roles/debian-init/defaults/main.yml
+++ b/image/assets/ansible/roles/debian-init/defaults/main.yml
@@ -15,10 +15,10 @@ initial_package:
   - htop
   - netcat
   - traceroute
+  - python3-docker
 
 initial_service:
   - serial-getty@ttyS0.service
-  - qemu-guest-agent.service
 
 # configure and enable network /etc/network/interface file
 enable_network: true
diff --git a/image/assets/ansible/roles/debian-init/handlers/main.yml b/image/assets/ansible/roles/debian-init/handlers/main.yml
index 650d474..8d1c73b 100644
--- a/image/assets/ansible/roles/debian-init/handlers/main.yml
+++ b/image/assets/ansible/roles/debian-init/handlers/main.yml
@@ -13,6 +13,6 @@
   become: yes
   service:
     name: qemu-guest-agent
-    state: started
+    # state: started
     enabled: yes
   when: '"qemu-guest-agent" in initial_package'
diff --git a/image/assets/hcl/source-debian.pkr.hcl b/image/assets/hcl/source-debian.pkr.hcl
index 2f70fe1..be420b4 100644
--- a/image/assets/hcl/source-debian.pkr.hcl
+++ b/image/assets/hcl/source-debian.pkr.hcl
@@ -44,5 +44,5 @@ source "qemu" "debian" {
   ssh_password       = "${var.ssh_password}"
   ssh_username       = "${var.ssh_username}"
   ssh_wait_timeout   = "900m"
-  vm_name            = "debian-${var.image_version}_packer.qcow2"
+  vm_name            = "debian-${var.image_version}_${timestamp()}_packer.qcow2"
 }