From 041ebfa229803fc2a09bc0528d706f10116d650a Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Fri, 1 Aug 2014 16:55:45 +0200
Subject: [PATCH] Move elections back to the tasks

---
 playbooks/groups/elections.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml
index b13aa7ba1c..e91d910870 100644
--- a/playbooks/groups/elections.yml
+++ b/playbooks/groups/elections.yml
@@ -35,13 +35,15 @@
   - fas_client
   - rsyncd
   - sudo
-  - { role: openvpn/client,
-      when: env != "staging" }
+#  - { role: openvpn/client,
+#      when: env != "staging" }
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks }}/openvpn_client.yml"
+    when: env != "staging"
   - include: "{{ tasks }}/apache.yml"
   - include: "{{ tasks }}/mod_wsgi.yml"