ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph-facts: set use_new_ceph_iscsi on iscsi nodes 

We don't need to set the use_new_ceph_iscsi fact on other nodes than
those present in the iscsigws group.
Also remove the duplicate iscsi_gw_group_name condition already present
on the include_task.
Finally validate the ansible distribution as the first task.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
pull/4863/head
Dimitri Savineau 2019-12-10 16:35:34 -05:00 committed by Guillaume Abrioux
parent 8d0dc34ebe
commit 68c6f39349
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ceph-facts/tasks/facts.yml
View File

@ -316,3 +316,4 @@
- name: set_fact use_new_ceph_iscsi package or old ceph-iscsi-config/cli - name: set_fact use_new_ceph_iscsi package or old ceph-iscsi-config/cli
set_fact: set_fact:
use_new_ceph_iscsi: "{{ (gateway_ip_list == '0.0.0.0' and gateway_iqn | length == 0 and client_connections | length == 0 and rbd_devices | length == 0) | bool | ternary(true, false) }}" use_new_ceph_iscsi: "{{ (gateway_ip_list == '0.0.0.0' and gateway_iqn | length == 0 and client_connections | length == 0 and rbd_devices | length == 0) | bool | ternary(true, false) }}"
when: iscsi_gw_group_name in group_names

33
roles/ceph-validate/tasks/check_iscsi.yml
View File

@ -1,4 +1,9 @@
--- ---
- name: fail on unsupported distribution for iscsi gateways
fail:
msg: "iSCSI gateways can only be deployed on Red Hat Enterprise Linux, CentOS or Fedora"
when: ansible_distribution not in ['RedHat', 'CentOS', 'Fedora']
- name: make sure gateway_ip_list is configured - name: make sure gateway_ip_list is configured
fail: fail:
msg: "you must set a list of IPs (comma separated) for gateway_ip_list" msg: "you must set a list of IPs (comma separated) for gateway_ip_list"
@ -25,21 +30,13 @@
- item.chap - item.chap
- " '' in client_connections | selectattr('status', 'match', 'present') | map(attribute='chap') | list" - " '' in client_connections | selectattr('status', 'match', 'present') | map(attribute='chap') | list"
- name: check if iscsi gateways is target on supported distros and versions - name: fail on unsupported distribution version for iscsi gateways
block: command: 'grep -q {{ item }}=m {% if is_atomic|bool %}/usr/lib/ostree-boot{% else %}/boot{% endif %}/config-{{ ansible_kernel }}'
- name: fail on unsupported distribution for iscsi gateways register: iscsi_kernel
fail: changed_when: false
msg: "iSCSI gateways can only be deployed on Red Hat Enterprise Linux, CentOS or Fedora" failed_when: iscsi_kernel.rc != 0
when: ansible_distribution not in ['RedHat', 'CentOS', 'Fedora'] loop:
- CONFIG_TARGET_CORE
- name: fail on unsupported distribution version for iscsi gateways - CONFIG_TCM_USER2
command: 'grep -q {{ item }}=m {% if is_atomic|bool %}/usr/lib/ostree-boot{% else %}/boot{% endif %}/config-{{ ansible_kernel }}' - CONFIG_ISCSI_TARGET
register: iscsi_kernel when: ansible_distribution in ['RedHat', 'CentOS']
changed_when: false
failed_when: iscsi_kernel.rc != 0
loop:
- CONFIG_TARGET_CORE
- CONFIG_TCM_USER2
- CONFIG_ISCSI_TARGET
when: ansible_distribution in ['RedHat', 'CentOS']
when: iscsi_gw_group_name in group_names