Require osd_scenario parameter to be provided in containerized deploy

Fixes: #2095

diff --git a/roles/ceph-osd/tasks/check_mandatory_vars.yml b/roles/ceph-osd/tasks/check_mandatory_vars.yml
index 1de618f638041f05b74f73a8e8e2ae38195276e3..7f560110b935ebf025b172dbd0d4a40de33b203f 100644 (file)
--- a/roles/ceph-osd/tasks/check_mandatory_vars.yml
+++ b/roles/ceph-osd/tasks/check_mandatory_vars.yml
@@ -26,7 +26,6 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not containerized_deployment
     - osd_scenario == 'dummy'
 
 - name: make sure a valid osd scenario was chosen
@@ -35,7 +34,6 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not containerized_deployment
     - not osd_scenario in valid_osd_scenarios
 
 - name: verify devices have been provided
@@ -103,7 +101,6 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not containerized_deployment
     - osd_scenario == 'non-collocated'
     - dedicated_devices|length == 0
       or devices|length == 0
@@ -114,7 +111,6 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not containerized_deployment
     - osd_scenario == 'non-collocated'
     - dedicated_devices is string
     - dedicated_devices|length == 0
@@ -126,6 +122,5 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not containerized_deployment
     - osd_objectstore == 'bluestore'
     - ceph_release_num[ceph_release] < ceph_release_num.luminous