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

ceph-default: rm useless condition 

This condition is useless and it's also creating issues we don't see in
our CI. ceph_release is set by either ceph-common or ceph-docker-common
so let's keep it this way.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1645379

(cherry picked from commit e9188cd202)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3543/head
Guillaume Abrioux 2019-01-02 14:30:27 +01:00 committed by mergify[bot]
parent 75855b2d58
commit eaa92f7e55
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@
include_tasks: release-rhcs.yml include_tasks: release-rhcs.yml
when: when:
- ceph_repository in ['rhcs', 'dev'] - ceph_repository in ['rhcs', 'dev']
or
ceph_origin == 'distro'
tags: tags:
- always - always

5
roles/ceph-facts/tasks/facts.yml
View File

@ -84,11 +84,6 @@
when: when:
- ceph_current_status.fsid is defined - ceph_current_status.fsid is defined
# Set ceph_release to ceph_stable by default
- name: set_fact ceph_release ceph_stable_release
set_fact:
ceph_release: "{{ ceph_stable_release }}"
- name: generate cluster fsid - name: generate cluster fsid
local_action: local_action:
module: shell module: shell

2
site.yml.sample
View File

@ -432,4 +432,4 @@
msg: "{{ ceph_status.stdout_lines }}" msg: "{{ ceph_status.stdout_lines }}"
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"
run_once: true run_once: true
when: not ceph_status.failed when: not ceph_status.failed