diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2018-02-16 20:54:52 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2018-02-16 20:54:52 +0100 |
| commit | 96ced00e05b50f276841a9212ae89e018de4d92d (patch) | |
| tree | b86c75fa97326dc89cc37c6dd23d294bd13eb56a /roles/ands_facts | |
| parent | cd94e324d3401e518578d91382a2b7ee67562112 (diff) | |
| download | ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.gz ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.bz2 ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.xz ands-96ced00e05b50f276841a9212ae89e018de4d92d.zip | |
Updated to OpenShift 3.7 and tested
Diffstat (limited to 'roles/ands_facts')
| -rw-r--r-- | roles/ands_facts/defaults/main.yml | 8 | ||||
| -rw-r--r-- | roles/ands_facts/tasks/detect_data_path.yml | 2 | ||||
| -rw-r--r-- | roles/ands_facts/tasks/main.yml | 32 |
3 files changed, 33 insertions, 9 deletions
diff --git a/roles/ands_facts/defaults/main.yml b/roles/ands_facts/defaults/main.yml index 257685d..ac61876 100644 --- a/roles/ands_facts/defaults/main.yml +++ b/roles/ands_facts/defaults/main.yml @@ -1,11 +1,11 @@ +ands_configure_heketi: false ands_data_device_default_threshold: 10 -ands_empty_lv: { 'vg': '' } +ands_storage_servers: "{{ groups.ands_storage_servers | map('extract', hostvars, 'ands_storage_hostname') | list }}" +#openshift_storage_nodes: "{{ groups.storage_nodes | map('extract', hostvars, 'ands_storage_hostname') | list }}" +ands_empty_lv: { 'vg': '' } ands_data_lv: "ands_data" ands_data_vg: "{{ ( ansible_lvm['lvs'][ands_data_lv] | default(ands_empty_lv) )['vg'] }}" ands_heketi_lv: "ands_heketi" ands_heketi_vg: "{{ ( ansible_lvm['lvs'][ands_heketi_lv] | default(ands_empty_lv) )['vg'] }}" - -ands_storage_servers: "{{ groups.ands_storage_servers | map('extract', hostvars, 'ands_storage_hostname') | list }}" -#openshift_storage_nodes: "{{ groups.storage_nodes | map('extract', hostvars, 'ands_storage_hostname') | list }}" 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 |