1 files changed, 10 insertions, 55 deletions
diff --git a/roles/ands_facts/tasks/main.yml b/roles/ands_facts/tasks/main.yml
index cf995a0..6b28683 100644
--- a/roles/ands_facts/tasks/main.yml
+++ b/roles/ands_facts/tasks/main.yml
@@ -1,59 +1,14 @@
-- include_vars: dir="vars"
+---
 
-- name: Detect Heketi
-  set_fact: ands_storage_domains="{{ ands_storage_domains | union([ands_heketi_domain]) }}"
-  when: 
-    - ands_configure_heketi
-    - ands_heketi_domain is defined
-    - ansible_lvm.lvs[ands_heketi_lv] is defined
+# The variables accessed trough 'hostvars' should be set as facts
+# Here we set 'ands_storage_servers' and other variables
+- name: "Configuring storage facts"
+  include_tasks: "storage.yml"
 
-- name: Set some facts
-  set_fact:
-    ands_storage_servers: "{{ ands_storage_servers }}"
-
-- name: Set some facts
-  set_fact:
-    ands_data_vg: "{{ ands_data_vg }}"
-  when: ands_data_vg != ""
-
-- name: Set some facts
-  set_fact:
-    ands_data_lv: "{{ ands_data_lv }}"
-  when: ands_data_lv != ""
-
-- name: Set some facts
-  set_fact:
-    ands_heketi_vg: "{{ ands_heketi_vg }}"
-  when: ands_heketi_vg != ""
-
-- name: Set some facts
-  set_fact:
-    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 != ""
+# Here we set 'openshift_hostname', 'openshift_ip' and other variables
+- name: "Configuring network facts"
+  include_tasks: "network.yml"
 
-- name: set some facts
+- name: "Confirm that ands facts are configured"
   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
-
+    ands_facts_configured: true