ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/607/head
Andrew Schoen 2016-03-07 14:50:05 -06:00
parent ad6ebbcb32
commit 9f1b437e9d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/ceph-common/tasks/installs/install_on_redhat.yml
View File

@ -147,10 +147,3 @@
- rbd_client_log_path - rbd_client_log_path
- rbd_client_admin_socket_path - rbd_client_admin_socket_path
when: rbd_client_directories 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

7
roles/ceph-common/tasks/main.yml
View File

@ -53,6 +53,13 @@
tags: tags:
- package-install - 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 # NOTE (leseb): be careful with the following
# somehow the YAML syntax using "is_ceph_infernalis: {{" # somehow the YAML syntax using "is_ceph_infernalis: {{"
# does NOT work, so we keep this syntax styling... # does NOT work, so we keep this syntax styling...