igw: move gateway_ip_list check to validate role

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit d89d3e7cd6868dda59c5eec721a5d27f095a84df)

diff --git a/roles/ceph-iscsi-gw/tasks/common.yml b/roles/ceph-iscsi-gw/tasks/common.yml
index 9ca684bd57f76b6e040d6c383b7767ed3205869a..111ec9ea547ea9ec8277b90273ed32b110e14e43 100644 (file)
--- 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 09abe50612feea21c4b72bca5e5beddf5c10a09f..de802d5489e7ba30ca097539c1b7681d6001b2ee 100644 (file)
--- 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."