From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 7 Mar 2016 20:50:05 +0000 (-0600)
Subject: find the rhcs version right before setting is_ceph_infernalis
X-Git-Tag: v1.0.2~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F607%2Fhead;p=ceph-ansible.git

find the rhcs version right before setting is_ceph_infernalis

Where it was located before meant it might be skipped if you don't run
tasks with the package-install tag. This fixes the situation where you
want to configure an rhcs node, but do not want to do any package
installs.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 34aa0160f..670e529ef 100644
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -147,10 +147,3 @@
    - rbd_client_log_path
    - rbd_client_admin_socket_path
   when: rbd_client_directories
-
-- name: get ceph rhcs version
-  shell: rpm -q --qf "%{version}\n" ceph-common | cut -f1,2 -d '.'
-  changed_when: false
-  failed_when: false
-  register: rh_storage_version
-  when: ceph_stable_rh_storage
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index cabadac12..98d42ad05 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -53,6 +53,13 @@
   tags:
     - package-install
 
+- name: get ceph rhcs version
+  shell: rpm -q --qf "%{version}\n" ceph-common | cut -f1,2 -d '.'
+  changed_when: false
+  failed_when: false
+  register: rh_storage_version
+  when: ceph_stable_rh_storage
+
 # NOTE (leseb): be careful with the following
 # somehow the YAML syntax using "is_ceph_infernalis: {{"
 # does NOT work, so we keep this syntax styling...