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/openshift-install.yml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'playbooks/openshift-install.yml')

diff --git a/playbooks/openshift-install.yml b/playbooks/openshift-install.yml
index f3a81ea..8d62b1c 100644
--- a/playbooks/openshift-install.yml
+++ b/playbooks/openshift-install.yml
@@ -2,25 +2,12 @@
   hosts: nodes
   roles:
     - { role: ands_facts }
-    - { role: ands_openshift, subrole: hostnames }
-
-- name: Temporary provision /etc/hosts with Masters IP.
-  hosts: nodes:!masters
-  tasks:
-    - lineinfile: dest="/etc/hosts" line="{{ ands_openshift_network | ipaddr(node_id) | ipaddr('address') }} {{ ands_openshift_lb }}" regexp=".*{{ ands_openshift_lb }}$" state="present"
-      when: (ands_provision_without_dns | default(false))
-  vars:
-    node_id: "{{ hostvars[groups['masters'][0]]['ands_host_id'] }}"
+    - { role: ands_network, action: install_pre }
 
 - import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml
-
-#- include: ../anslib/openshift-ansible/playbooks/byo/config.yml
-#- include: ../anslib/openshift-ansible/playbooks/deploy_cluster.yml
 - import_playbook: ../anslib/openshift-ansible/playbooks/deploy_cluster.yml
-#- import_playbook: openshift-deploy-cluster.yml
 
-- name: Remove temporary entries in /etc/hosts
-  hosts: nodes:!masters
-  tasks:
-    - lineinfile: dest="/etc/hosts" regexp=".*{{ ands_openshift_lb }}$" state="absent"
-      when: (ands_provision_without_dns | default(false))
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_network, action: install_post }
-- 
cgit v1.2.3