From bd7d776e3bf303cbbda284af861825e495795a29 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Mon, 21 Sep 2015 18:04:19 +0200 Subject: [PATCH] Fix and improve checks when ceph_origin == 'distro' --- .../ceph-common/tasks/checks/check_mandatory_vars.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml index 4118c2d2e..dee96af34 100644 --- 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