From 6bc3a3ac71e11fb6459df715536fec373c123a97 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 7 Mar 2018 07:03:57 +0100
Subject: Streamlined networking, OpenShift recovery, Ganesha

---
 playbooks/ands-prepare.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'playbooks/ands-prepare.yml')

diff --git a/playbooks/ands-prepare.yml b/playbooks/ands-prepare.yml
index e8c785b..d198ec0 100644
--- a/playbooks/ands-prepare.yml
+++ b/playbooks/ands-prepare.yml
@@ -1,22 +1,28 @@
-- name: Common setup procedures
+- name: Determin Ands facts
   hosts: ands
   roles:
     - role: ands_facts
+
+- name: Prepare virtual hosts
+  hosts: virtual
+  roles:
+    - role: ands_vagrant_vmconf
+
+- name: Common setup procedures
+  hosts: ands
+  roles:
     - role: common
     - role: firewall
+    - { role: ands_network, action: common }
 
 - name: Keepalived service
-  hosts: masters, new_masters
+  hosts: masters
   roles:
     - role: keepalived
-  vars:
-    keepalived_vips: "{{ ands_ipfailover_vips | default([]) }}"
-    keepalived_iface: "{{ ands_ipfailover_interface | default('eth0') }}"
-    keepalived_password: "{{ ands_secrets.keepalived }}"
 
 #OpenVPN started before Origin-node causes problems
 #- name: OpenVPN service
-#  hosts: nodes
+#  hosts: nodes, new_nodes
 #  roles:
 #    - role: openvpn
 #  vars:
-- 
cgit v1.2.3