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

Merge pull request #1557 from ceph/install-condition 

common: fix installation condition
pull/1469/head
Andrew Schoen 2017-05-24 06:39:36 -05:00 committed by GitHub
parent aae4dd4aa9 468dc06bcd
commit 2326c5ac63
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-common/tasks/checks/check_mandatory_vars.yml
View File

@ -29,6 +29,6 @@
- ceph_rhcs - ceph_rhcs
- not ceph_rhcs_cdn_install - not ceph_rhcs_cdn_install
- not ceph_rhcs_iso_install - not ceph_rhcs_iso_install
- ceph_origin == "upstream" - ceph_origin != 'distro'
tags: tags:
- package-install - package-install

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

@ -74,8 +74,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- mon_group_name in group_names - mon_group_name in group_names
or ceph_origin == "distro"
or ceph_custom
- name: install distro or red hat storage ceph osd - name: install distro or red hat storage ceph osd
package: package:
@ -83,8 +81,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- osd_group_name in group_names - osd_group_name in group_names
or ceph_origin == "distro"
or ceph_custom
- name: install distro or red hat storage ceph mds - name: install distro or red hat storage ceph mds
package: package:
@ -92,8 +88,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- mds_group_name in group_names - mds_group_name in group_names
or ceph_origin == "distro"
or ceph_custom
- name: install distro or red hat storage ceph-fuse - name: install distro or red hat storage ceph-fuse
package: package:
@ -101,9 +95,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- client_group_name in group_names - client_group_name in group_names
or ceph_origin == "distro"
or ceph_dev
or ceph_custom
- name: install distro or red hat storage ceph base - name: install distro or red hat storage ceph base
package: package:
@ -111,8 +102,6 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- client_group_name in group_names - client_group_name in group_names
or ceph_origin == "distro"
or ceph_custom
- name: install ceph-test - name: install ceph-test
package: package: