]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Rebased with upstream master
authorJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Mon, 26 Sep 2016 03:22:16 +0000 (23:22 -0400)
committerJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Mon, 26 Sep 2016 03:22:16 +0000 (23:22 -0400)
1  2 
roles/ceph-common/tasks/installs/install_on_redhat.yml
roles/ceph-mon/tasks/deploy_monitors.yml

index 83d090a54d3c94faea4428a7ee4f262e7a2ea5ea,8ce15734b8de236fcb476d4468530ef8fceff141..1dad511deec00ad0f0882b477daa837a3a642757
    when:
      - mds_group_name in group_names
      - ansible_pkg_mgr == "dnf"
 -    - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
 +    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
        or ceph_origin == "distro"
 -      or ceph_dev
        or ceph_custom
  
+ - name: install distro or red hat storage ceph-fuse via yum
+   yum:
+     name: "ceph-fuse"
+     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+   when:
+     - client_group_name in group_names
+     - ansible_pkg_mgr == "yum"
+     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
+       or ceph_origin == "distro"
+       or ceph_dev
+       or ceph_custom
+ - name: install distro or red hat storage ceph-fuse via dnf
+   dnf:
+     name: "ceph-fuse"
+     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+   when:
+     - client_group_name in group_names
+     - ansible_pkg_mgr == "dnf"
+     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
+       or ceph_origin == "distro"
+       or ceph_dev
+       or ceph_custom
  - name: install distro or red hat storage ceph base via yum
    yum:
      name: "ceph-base"