add-osd: refact the playbook

There's no need to have two plays anymore since we now set/unset osd
flags in `ceph-osd` role.

Also, this commit makes the role `ceph-facts` to be called after
`ceph-defaults`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/5267/head
Guillaume Abrioux 2020-04-07 15:35:38 +02:00 committed by Dimitri Savineau
parent 724620ed3d
commit a51331beb9
1 changed files with 2 additions and 31 deletions

View File

@ -15,36 +15,6 @@
# you want to play the playbook on. So you need to comment already deployed OSD
# and let uncommented the new OSDs.
#
- hosts:
- mons
- osds
gather_facts: False
become: true
vars:
delegate_facts_host: True
pre_tasks:
- name: gather facts
setup:
when:
- not delegate_facts_host | bool
- name: gather and delegate facts
setup:
delegate_to: "{{ item }}"
delegate_facts: True
with_items: "{{ groups['all'] | difference(groups.get('clients', [])) }}"
run_once: True
when:
- delegate_facts_host | bool
roles:
- ceph-defaults
- ceph-facts
- ceph-validate
- hosts: osds
gather_facts: False
become: True
@ -75,11 +45,12 @@
roles:
- role: ceph-defaults
- role: ceph-facts
- role: ceph-validate
- role: ceph-handler
- role: ceph-infra
- role: ceph-docker-common
when: containerized_deployment | bool
- role: ceph-facts
- role: ceph-common
when: not containerized_deployment | bool
- role: ceph-config