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 #1883 from ceph/quick_refact 

osd: refact include of `activate_osds.yml`
pull/1888/head
Sébastien Han 2017-09-12 22:11:31 -06:00 committed by GitHub
parent c3866fc4bd 49ad8528e5
commit ac62437609
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-osd/tasks/main.yml
View File

@ -46,6 +46,12 @@
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False
- include: ./activate_osds.yml
when:
- not containerized_deployment
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- name: ensure osd daemons are started - name: ensure osd daemons are started
include: start_osds.yml include: start_osds.yml
when: when:

2
roles/ceph-osd/tasks/scenarios/collocated.yml
View File

@ -67,5 +67,3 @@
- item.0.get("rc", 0) != 0 - item.0.get("rc", 0) != 0
- item.1.get("rc", 0) != 0 - item.1.get("rc", 0) != 0
- not containerized_deployment - not containerized_deployment
- include: ../activate_osds.yml

2
roles/ceph-osd/tasks/scenarios/non-collocated.yml
View File

@ -85,5 +85,3 @@
- item.0.get("rc", 0) != 0 - item.0.get("rc", 0) != 0
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- not containerized_deployment - not containerized_deployment
- include: ../activate_osds.yml