Merge pull request #1999 from ceph/bz-1486062

common: remove unusuable conditions
pull/1957/head
Sébastien Han 2017-10-05 15:01:00 +02:00 committed by GitHub
commit 8f75eac6f4
3 changed files with 0 additions and 4 deletions

View File

@ -68,4 +68,3 @@
default_release: "{{ ceph_stable_release_uca | default(omit) }}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}" default_release: "{{ ceph_stable_release_uca | default(omit) }}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
when: when:
- mgr_group_name in group_names - mgr_group_name in group_names
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

View File

@ -77,4 +77,3 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- mgr_group_name in group_names - mgr_group_name in group_names
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

View File

@ -100,7 +100,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- mgr_group_name in group_names - mgr_group_name in group_names
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
- name: install redhat ceph iscsi package - name: install redhat ceph iscsi package
package: package:
@ -112,4 +111,3 @@
- targetcli - targetcli
when: when:
- iscsi_gw_group_name in group_names - iscsi_gw_group_name in group_names
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous