osd: docker change required variables for check

when running a containerized deployment, some variable are not
applicable thus should not be checked.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-osd/tasks/check_mandatory_vars.yml b/roles/ceph-osd/tasks/check_mandatory_vars.yml
index a60b819e6b87ff30a9451f68a2a5c346a657ab25..46b7764782d3f1e4ce5d73d5a809113fc792fd20 100644 (file)
--- 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