mirror of https://github.com/ceph/ceph-ansible.git
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
parent
ee08d1f89a
commit
4a3f180f9d
|
@ -39,6 +39,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
|
||||||
|
|
||||||
|
|
|
@ -98,11 +98,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
|
||||||
shell: python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
|
shell: python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
|
||||||
args:
|
args:
|
||||||
|
|
|
@ -458,8 +458,6 @@
|
||||||
name: ceph-handler
|
name: ceph-handler
|
||||||
- import_role:
|
- import_role:
|
||||||
name: ceph-common
|
name: ceph-common
|
||||||
when:
|
|
||||||
- ceph_release_num[ceph_release] >= ceph_release_num.luminous
|
|
||||||
- import_role:
|
- import_role:
|
||||||
name: ceph-config
|
name: ceph-config
|
||||||
tags: ['ceph_update_config']
|
tags: ['ceph_update_config']
|
||||||
|
|
Loading…
Reference in New Issue