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 #1961 from ceph/site-condition-2 

[skip ci]  site: s/ceph_stable_release/ceph_release
pull/1964/head
Sébastien Han 2017-09-29 02:28:48 +02:00 committed by GitHub
parent 1de7765411 b869a7aea5
commit 38e6ae7ce0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site-docker.yml.sample
View File

@ -39,8 +39,8 @@
roles:
- ceph-defaults
- ceph-docker-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
- hosts: osds
become: True

8
site.yml.sample
View File

@ -67,8 +67,8 @@
roles:
- ceph-defaults
- ceph-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
- hosts: agents
gather_facts: false
@ -148,6 +148,6 @@
roles:
- ceph-defaults
- ceph-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
- { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
- { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }