From 81baa6bb737947578228c465e9101559db6a8ccb Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 15 Dec 2016 14:50:04 +0100 Subject: [PATCH] osd: docker change required variables for check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit when running a containerized deployment, some variable are not applicable thus should not be checked. Signed-off-by: Sébastien Han --- roles/ceph-osd/tasks/check_mandatory_vars.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/ceph-osd/tasks/check_mandatory_vars.yml b/roles/ceph-osd/tasks/check_mandatory_vars.yml index a60b819e6..46b776478 100644 --- a/roles/ceph-osd/tasks/check_mandatory_vars.yml +++ b/roles/ceph-osd/tasks/check_mandatory_vars.yml @@ -7,7 +7,9 @@ - name: make sure cluster_network configured fail: msg: "cluster_network must be configured. Ceph replication network" - when: cluster_network == '0.0.0.0/0' + when: + - cluster_network == '0.0.0.0/0' + - not osd_containerized_deployment - name: make sure journal_size configured debug: @@ -23,6 +25,7 @@ when: - osd_group_name is defined - osd_group_name in group_names + - not osd_containerized_deployment - not journal_collocation - not raw_multi_journal - not osd_directory @@ -36,6 +39,7 @@ when: - osd_group_name is defined - osd_group_name in group_names + - not osd_containerized_deployment - (journal_collocation and raw_multi_journal) or (journal_collocation and osd_directory) or (journal_collocation and bluestore) @@ -58,7 +62,7 @@ when: - osd_group_name is defined - osd_group_name in group_names - - journal_collocation + - (journal_collocation or osd_containerized_deployment) - not osd_auto_discovery - devices|length == 0 @@ -68,6 +72,7 @@ when: - osd_group_name is defined - osd_group_name in group_names + - not osd_containerized_deployment - raw_multi_journal - raw_journal_devices|length == 0 or devices|length == 0 @@ -78,5 +83,6 @@ when: - osd_group_name is defined - osd_group_name in group_names + - not osd_containerized_deployment - osd_directory - osd_directories is not defined -- 2.39.5