Fix and improve checks when ceph_origin == 'distro'

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index 4118c2d2e335e9bd2fc6c5c0a2103f1db8018565..dee96af341c757a6c90e9b40c3f1ca045abc9773 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -1,8 +1,16 @@
 ---
+- name: make sure an installation origin was chosen
+  fail:
+    msg: "choose an installation origin"
+  when:
+    ceph_origin != 'upstream' and
+    ceph_origin != 'distro'
+
 - name: make sure an installation source was chosen
   fail:
-    msg: "choose an installation source or read https://github.com/ceph/ceph-ansible/wiki"
+    msg: "choose an upstream installation source or read https://github.com/ceph/ceph-ansible/wiki"
   when:
+    ceph_origin == 'upstream' and
     not ceph_stable and
     not ceph_dev and
     not ceph_stable_ice and