From eff1dd94ded67b9ff5a5d023b044828777c0d067 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Mon, 5 Mar 2018 23:46:40 +0100
Subject: [PATCH] package, Reorder site.yml

---
 ansible.cfg  |  4 ++--
 roles/common |  2 +-
 site.yml     | 58 ++++++++++++++++++++++------------------------------
 3 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/ansible.cfg b/ansible.cfg
index 60096e2..c2951b2 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,6 +1,6 @@
 [defaults]
-forks=2
+forks=20
 [privilege_escalation]
 ask_pass=True
-[ssh_connection] 
+[ssh_connection]
 pipelining=True
diff --git a/roles/common b/roles/common
index e0e5d97..1db29a0 160000
--- a/roles/common
+++ b/roles/common
@@ -1 +1 @@
-Subproject commit e0e5d97eb70d5e7fa763bd286d6bf36843d143d6
+Subproject commit 1db29a04e86489160a7f2838f51a61cf5a8eb11e
diff --git a/site.yml b/site.yml
index ef86a31..fc0dd1e 100644
--- a/site.yml
+++ b/site.yml
@@ -1,45 +1,37 @@
 ---
-- hosts: backup
-  user: root
-  become: False
-  roles:
-  - common
-  - backup
-
-- hosts: backupclient
-  user: root
-  become: False
-  roles:
-  - common
-  - backupclient
-
-- hosts: ruby
-  become: true
-  roles:
-  - common
-  - rvm1-ansible
-
-- hosts: test_common
-  become: True
-
 - hosts: all
   gather_facts: False
   tasks:
   - name: install python
-    raw: test -e /usr/bin/python || (apt-get update && apt-get install -y python)
+    raw: test -e /usr/bin/python || (apt-get update && apt-get install -y python) || (xbps-install -S && xbps-install python)
   - name: install python3
-    raw: test -e /usr/bin/python3 || (apt-get update && apt-get install -y python3)
-
-- hosts: ariane
-  roles:
-    - common
-    - ariane
-#    - rvm1-ansible
+    raw: test -e /usr/bin/python3 || (apt-get update && apt-get install -y python3) || (xbps-install -S && xbps-install python)
 
 - hosts: fet
   roles:
-    - common
+  - common
+
+- hosts: ariane
+  roles:
+  - ariane
+#  - rvm1-ansible
 
 - hosts: betam
   roles:
-    - ups
+  - ups
+
+- hosts: backup
+  roles:
+  - backup
+
+- hosts: backupclient
+  roles:
+  - backupclient
+
+- hosts: ruby
+  become: True
+  roles:
+  - rvm1-ansible
+
+- hosts: test_common
+  become: True