From 8fd2bf7e2ce559145e820717afa96852ac0d0998 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 30 Aug 2017 12:53:09 -0400 Subject: [PATCH 1/3] common: use the value of ceph_repository in the error message Signed-off-by: Alfredo Deza --- roles/ceph-common/tasks/checks/check_mandatory_vars.yml | 2 +- 1 file changed, 1 insertion(+), 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 c542ed825..4b3922571 100644 --- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml +++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml @@ -25,7 +25,7 @@ - name: make sure ceph_stable_release is set fail: - msg: "make sure ceph_stable_release is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/" + msg: "make sure ceph_stable_release ( {{ ceph_stable_release }} ) is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/" when: - ceph_stable_release == 'dummy' - (ceph_repository != 'rhcs' or ceph_repository != 'dev') From 6565c382384809d253356ea623cd7177cb77373d Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 30 Aug 2017 13:33:00 -0400 Subject: [PATCH 2/3] common: ceph_repository should not be rhcs or dev Signed-off-by: Alfredo Deza --- roles/ceph-common/tasks/checks/check_mandatory_vars.yml | 2 +- 1 file changed, 1 insertion(+), 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 4b3922571..6296e705d 100644 --- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml +++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml @@ -28,7 +28,7 @@ msg: "make sure ceph_stable_release ( {{ ceph_stable_release }} ) is set to a release name (e.g: luminous), http://docs.ceph.com/docs/master/release-notes/" when: - ceph_stable_release == 'dummy' - - (ceph_repository != 'rhcs' or ceph_repository != 'dev') + - ceph_repository not in ['rhcs', 'dev'] tags: - package-install From da90edce3e205fd31d2b9b5ed1a62747b2aa5d7c Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 30 Aug 2017 13:37:24 -0400 Subject: [PATCH 3/3] common dev repos should not need to specify a 'release' Signed-off-by: Alfredo Deza --- roles/ceph-common/tasks/checks/check_mandatory_vars.yml | 2 +- 1 file changed, 1 insertion(+), 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 6296e705d..3525e0f34 100644 --- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml +++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml @@ -38,7 +38,7 @@ when: - ceph_stable_release not in ceph_release_num - ceph_origin == 'repository' - - ceph_repository != 'rhcs' + - ceph_repository not in ['rhcs', 'dev'] tags: - package-install