From bb4d0a6695883617743a5da1f185709ddee08c8a Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 30 Jul 2019 10:37:27 +0200
Subject: [PATCH] Remove group vars folder and restructure
---
.gitignore | 2 +-
README.md | 2 +-
group_vars/all/vars.yml | 3 ---
hosts | 3 +++
{scripts => inventory_plugins}/inventory_re2o.ini.example | 0
5 files changed, 5 insertions(+), 5 deletions(-)
delete mode 100644 group_vars/all/vars.yml
rename {scripts => inventory_plugins}/inventory_re2o.ini.example (100%)
diff --git a/.gitignore b/.gitignore
index 7b00ee5d..25350ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.retry
-scripts/inventory_re2o.ini
+inventory_plugins/inventory_re2o.ini
__pycache__
diff --git a/README.md b/README.md
index bca93fbc..7a3fe44b 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ ssh-copy-id zamok.crans.org
Pour tester le playbook `base.yml` :
```bash
-ansible-playbook --ask-vault-pass base.yml --check
+ansible-playbook base.yml --check
```
Vous pouvez ensuite enlever `--check` si vous voulez appliquer les changements !
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
deleted file mode 100644
index 748e5f95..00000000
--- a/group_vars/all/vars.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# Use Python 3
-ansible_python_interpreter: /usr/bin/python3
diff --git a/hosts b/hosts
index 18b55031..25536920 100644
--- a/hosts
+++ b/hosts
@@ -219,3 +219,6 @@ crans_vm
crans_server
ovh
+[all:vars]
+# Force remote to use Python 3
+ansible_python_interpreter=/usr/bin/python3
diff --git a/scripts/inventory_re2o.ini.example b/inventory_plugins/inventory_re2o.ini.example
similarity index 100%
rename from scripts/inventory_re2o.ini.example
rename to inventory_plugins/inventory_re2o.ini.example
--
GitLab