From d1c7ec81c1ad625ef259f2ae17ad01dc087dcf1c Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 3 Aug 2017 10:43:05 -0500 Subject: [PATCH] ceph-common: move release-rhs.yml after ceph_version is set These tasks needs to be run after we set ceph_version or they fail because it's undefined. Signed-off-by: Andrew Schoen --- roles/ceph-common/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 5ecc9a6a2..c19ee0c77 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -84,12 +84,6 @@ # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) static: False -# override ceph_stable_release for ceph_dev and rhcs installations since ceph_stable_release is not mandatory -- include: ./release-rhcs.yml - when: (ceph_rhcs or ceph_dev) - tags: - - always - - include: ./misc/ntp_redhat.yml when: - ansible_os_family == 'RedHat' @@ -113,6 +107,12 @@ - set_fact: ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}" +# override ceph_stable_release for ceph_dev and rhcs installations since ceph_stable_release is not mandatory +- include: ./release-rhcs.yml + when: (ceph_rhcs or ceph_dev) + tags: + - always + - include: facts_mon_fsid.yml run_once: true when: -- 2.39.5