From b7b2213be18cf4fd827389fbc88613bf3e242b82 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Thu, 30 May 2019 10:55:45 -0500 Subject: [PATCH] igw: drop gateway_ip_list for container setups The gateway_ip_list is not used in container setups, so drop it for that case. Signed-off-by: Mike Christie --- roles/ceph-validate/tasks/check_iscsi.yml | 4 +++- tests/functional/all_daemons/container/group_vars/iscsigws | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/ceph-validate/tasks/check_iscsi.yml b/roles/ceph-validate/tasks/check_iscsi.yml index de802d548..1bdd45078 100644 --- a/roles/ceph-validate/tasks/check_iscsi.yml +++ b/roles/ceph-validate/tasks/check_iscsi.yml @@ -2,7 +2,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'" + when: + - "gateway_ip_list | default('0.0.0.0') == '0.0.0.0'" + - not containerized_deployment | bool - name: fail if unsupported chap configuration fail: diff --git a/tests/functional/all_daemons/container/group_vars/iscsigws b/tests/functional/all_daemons/container/group_vars/iscsigws index 401805eb3..8d0932ab4 100644 --- a/tests/functional/all_daemons/container/group_vars/iscsigws +++ b/tests/functional/all_daemons/container/group_vars/iscsigws @@ -1,3 +1,2 @@ --- -gateway_ip_list: 192.168.1.90 -generate_crt: True \ No newline at end of file +generate_crt: True