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

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3055/head
Guillaume Abrioux 2019-01-02 14:30:27 +01:00
parent ee08d1f89a
commit 4a3f180f9d
3 changed files with 2 additions and 7 deletions

View File

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

View File

@ -98,11 +98,6 @@
when:
- 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
shell: python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
args:

View File

@ -458,8 +458,6 @@
name: ceph-handler
- import_role:
name: ceph-common
when:
- ceph_release_num[ceph_release] >= ceph_release_num.luminous
- import_role:
name: ceph-config
tags: ['ceph_update_config']