From f984db5544e8e819c82d26fe21d15f3928b6fb7c Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Thu, 30 May 2019 10:54:04 -0500 Subject: [PATCH] igw: move gateway_ip_list check to validate role Signed-off-by: Mike Christie (cherry picked from commit d89d3e7cd6868dda59c5eec721a5d27f095a84df) --- roles/ceph-iscsi-gw/tasks/common.yml | 5 ----- roles/ceph-validate/tasks/check_iscsi.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/ceph-iscsi-gw/tasks/common.yml b/roles/ceph-iscsi-gw/tasks/common.yml index 9ca684bd5..111ec9ea5 100644 --- a/roles/ceph-iscsi-gw/tasks/common.yml +++ b/roles/ceph-iscsi-gw/tasks/common.yml @@ -1,9 +1,4 @@ --- -- name: make sure gateway_ip_list is configured - fail: - msg: "you must set a list of IPs (comma separated) for gateway_ip_list" - when: gateway_ip_list == "0.0.0.0" - - name: copy admin key copy: src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring" diff --git a/roles/ceph-validate/tasks/check_iscsi.yml b/roles/ceph-validate/tasks/check_iscsi.yml index 09abe5061..de802d548 100644 --- a/roles/ceph-validate/tasks/check_iscsi.yml +++ b/roles/ceph-validate/tasks/check_iscsi.yml @@ -1,4 +1,9 @@ --- +- name: make sure gateway_ip_list is configured + fail: + msg: "you must set a list of IPs (comma separated) for gateway_ip_list" + when: "gateway_ip_list | default('0.0.0.0') == '0.0.0.0'" + - name: fail if unsupported chap configuration fail: msg: "Mixing clients with CHAP enabled and disabled is not supported." -- 2.39.5