Merge pull request #745 from ceph/dev-package

ceph-common: install ceph-mon/osd for ceph dev
pull/746/head
Leseb 2016-05-02 15:05:31 +02:00
commit ce389a01f2
1 changed files with 4 additions and 4 deletions

View File

@ -41,7 +41,7 @@
name: "ceph-mon" name: "ceph-mon"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
mon_group_name in group_names and mon_group_name in group_names and
ansible_pkg_mgr == "yum" ansible_pkg_mgr == "yum"
@ -51,7 +51,7 @@
name: "ceph-mon" name: "ceph-mon"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
mon_group_name in group_names and mon_group_name in group_names and
ansible_pkg_mgr == "dnf" ansible_pkg_mgr == "dnf"
@ -61,7 +61,7 @@
name: "ceph-osd" name: "ceph-osd"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
osd_group_name in group_names and osd_group_name in group_names and
ansible_pkg_mgr == "yum" ansible_pkg_mgr == "yum"
@ -71,7 +71,7 @@
name: "ceph-osd" name: "ceph-osd"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
osd_group_name in group_names and osd_group_name in group_names and
ansible_pkg_mgr == "dnf" ansible_pkg_mgr == "dnf"