From 96ced00e05b50f276841a9212ae89e018de4d92d Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Fri, 16 Feb 2018 20:54:52 +0100
Subject: Updated to OpenShift 3.7 and tested

---
 roles/ands_facts/tasks/detect_data_path.yml |  2 +-
 roles/ands_facts/tasks/main.yml             | 32 +++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'roles/ands_facts/tasks')

diff --git a/roles/ands_facts/tasks/detect_data_path.yml b/roles/ands_facts/tasks/detect_data_path.yml
index 0837e12..c509d1f 100644
--- a/roles/ands_facts/tasks/detect_data_path.yml
+++ b/roles/ands_facts/tasks/detect_data_path.yml
@@ -7,4 +7,4 @@
     - not ands_data_path is defined
     - ansible_lvm.lvs[ands_data_lv] is defined
     - ansible_lvm.lvs[ands_data_lv].size_g > ( ands_data_device_threshold | default(ands_data_device_default_threshold) )
-    - item.device == "/dev/mapper/{{ands_data_vg}}-{{ands_data_lv}}"
+    - item.device == ands_data_dev
diff --git a/roles/ands_facts/tasks/main.yml b/roles/ands_facts/tasks/main.yml
index 52cc5bc..cf995a0 100644
--- a/roles/ands_facts/tasks/main.yml
+++ b/roles/ands_facts/tasks/main.yml
@@ -1,11 +1,11 @@
 - include_vars: dir="vars"
 
-- include: detect_data_path.yml
-  when: not ands_data_path is defined
-
 - name: Detect Heketi
   set_fact: ands_storage_domains="{{ ands_storage_domains | union([ands_heketi_domain]) }}"
-  when: ansible_lvm.lvs[ands_heketi_lv] is defined
+  when: 
+    - ands_configure_heketi
+    - ands_heketi_domain is defined
+    - ansible_lvm.lvs[ands_heketi_lv] is defined
 
 - name: Set some facts
   set_fact:
@@ -31,5 +31,29 @@
     ands_heketi_lv: "{{ ands_heketi_lv }}"
   when: ands_heketi_lv != ""
 
+- name: Set some facts
+  set_fact:
+    ands_data_dev: "/dev/mapper/{{ands_data_vg}}-{{ands_data_lv}}"
+  when: 
+    - ands_data_vg != ""
+    - ands_data_lv != ""
+
+- name: set some facts
+  set_fact:
+    ands_heketi_dev: "/dev/mapper/{{ands_heketi_vg}}-{{ands_heketi_lv}}"
+  when: 
+    - ands_heketi_vg != ""
+    - ands_heketi_lv != ""
+
+- name: set some facts
+  set_fact:
+    glusterfs_devices: [ "{{ ands_heketi_dev }}" ]
+  when: 
+    - ands_heketi_vg != ""
+    - ands_heketi_lv != ""
+
+- include_tasks: detect_data_path.yml
+  when: not ands_data_path is defined
+
 #- command: yum-complete-transaction --cleanup-only
 
-- 
cgit v1.2.3