From 4a8144d3c2d407322ccb3bf8c10d271b7af367a9 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 6 Oct 2017 15:47:37 +0200
Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20jour=20des=20tests=20avec=20vag?=
 =?UTF-8?q?rant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/Vagrantfile | 10 ++++++++--
 test/vagrant.yml | 33 +++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/test/Vagrantfile b/test/Vagrantfile
index 70dab1d..7c86f2c 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -4,7 +4,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian/jessie64"
+  config.vm.box = "debian/stretch64"
+  # config.vm.box = "debian/jessie64"
 
   config.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: true
 
@@ -23,7 +24,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ansible.limit = "default"
       ansible.playbook = "vagrant.yml"
       # ansible.tags = "mysql"
-      ansible.raw_arguments = ["-b"]
+      ansible.raw_arguments = [
+        "-b",
+        "--ask-vault-pass",
+        # "--syntax",
+        # "-vvv",
+      ]
     end
   end
 
diff --git a/test/vagrant.yml b/test/vagrant.yml
index 8e84916..b14e9c6 100644
--- a/test/vagrant.yml
+++ b/test/vagrant.yml
@@ -2,10 +2,15 @@
 - hosts: default
   gather_facts: yes
   become: yes
+
+  vars_files:
+    - ~/evolix/private/vars/evolinux-secrets.yml
+
   vars:
-    roles: ~/GIT/ansible-roles
     evolinux_apt_upgrade: False
-    minifirewall_trusted_ips: [192.168.4.0/24]
+    evolinux_apt_public_sources: True
+    # minifirewall_trusted_ips: [192.168.4.0/16]
+    fail2ban_ignoreip: ["192.168.0.0/16"]
     minifirewall_privilegied_ips: []
     minifirewall_protected_ports_tcp: [22]
     minifirewall_protected_ports_udp: [1234]
@@ -16,14 +21,18 @@
     minifirewall_private_ports_tcp: []
     minifirewall_private_ports_udp: [6547]
 
+    evolinux_hostname: "vagrant"
+    evolinux_domain: "evolix.local"
+    evolinux_fqdn: "vagrant.evolix.local"
+
   roles:
-  - "{{ roles }}/etc-git"
-  - "{{ roles }}/evolinux-base"
-  - "{{ roles }}/admin-users"
-  - "{{ roles }}/munin"
-  - "{{ roles }}/minifirewall"
-  - "{{ roles }}/squid"
-  - "{{ roles }}/fail2ban"
-  - "{{ roles }}/nagios-nrpe"
-  - "{{ roles }}/listupgrade"
-  - "{{ roles }}/evomaintenance"
+  - etc-git
+  - evolinux-base
+  - admin-users
+
+  post_tasks:
+  - include_role:
+      name: etc-git
+      tasks_from: commit.yml
+    vars:
+      commit_message: "Ansible post-run my splendid playbook"