mirror of https://github.com/ceph/ceph-ansible.git
osd: support scaling up using --limit
This commit lets add-osd.yml in place but mark the deprecation of the
playbook.
Scaling up OSDs is now possible using --limit
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3496a0efa2
)
pull/4934/head
parent
dc797971ce
commit
2d85fab02d
|
@ -121,3 +121,10 @@
|
|||
delegate_to: "{{ groups['mons'][0] }}"
|
||||
run_once: True
|
||||
changed_when: False
|
||||
|
||||
- name: warn user about deprecation
|
||||
debug:
|
||||
msg: |
|
||||
Playbook has complete.
|
||||
However, note that it will be deprecated in a future release.
|
||||
You can achieve the same goal using the main playbook with --limit
|
|
@ -3,6 +3,11 @@
|
|||
set_fact:
|
||||
_osd_handler_called: True
|
||||
|
||||
- name: unset noup flag
|
||||
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd unset noup"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
changed_when: False
|
||||
|
||||
# This does not just restart OSDs but everything else too. Unfortunately
|
||||
# at this time the ansible role does not have an OSD id list to use
|
||||
# for restarting them specifically.
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
---
|
||||
- name: set_fact add_osd
|
||||
set_fact:
|
||||
add_osd: "{{ groups[osd_group_name] | length != ansible_play_hosts_all | length }}"
|
||||
|
||||
- name: include_tasks system_tuning.yml
|
||||
include_tasks: system_tuning.yml
|
||||
|
||||
|
@ -33,6 +37,13 @@
|
|||
- name: include_tasks common.yml
|
||||
include_tasks: common.yml
|
||||
|
||||
- name: set noup flag
|
||||
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd set noup"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
run_once: True
|
||||
changed_when: False
|
||||
when: not rolling_update | default(False) | bool
|
||||
|
||||
- name: include container_options_facts.yml
|
||||
include_tasks: container_options_facts.yml
|
||||
|
||||
|
@ -72,7 +83,7 @@
|
|||
openstack_keys_tmp: "{{ openstack_keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap, 'osd': item.osd_cap|default(''), 'mds': item.mds_cap|default(''), 'mgr': item.mgr_cap|default('') } , 'mode': item.mode } ] }}"
|
||||
with_items: "{{ openstack_keys }}"
|
||||
when:
|
||||
- not add_osd|default(False) | bool
|
||||
- not add_osd | bool
|
||||
- openstack_config | bool
|
||||
- item.get('mon_cap', None)
|
||||
# it's enough to assume we are running an old-fashionned syntax simply by checking the presence of mon_cap since every key needs this cap
|
||||
|
@ -81,13 +92,21 @@
|
|||
set_fact:
|
||||
openstack_keys: "{{ openstack_keys_tmp }}"
|
||||
when:
|
||||
- not add_osd|default(False) | bool
|
||||
- not add_osd | bool
|
||||
- openstack_keys_tmp is defined
|
||||
|
||||
- name: unset noup flag
|
||||
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd unset noup"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
changed_when: False
|
||||
when:
|
||||
- not rolling_update | default(False) | bool
|
||||
- inventory_hostname == ansible_play_hosts_all | last
|
||||
|
||||
# Create the pools listed in openstack_pools
|
||||
- name: include openstack_config.yml
|
||||
include_tasks: openstack_config.yml
|
||||
when:
|
||||
- not add_osd|default(False) | bool
|
||||
- not add_osd | bool
|
||||
- openstack_config | bool
|
||||
- inventory_hostname == groups[osd_group_name] | last
|
||||
|
|
Loading…
Reference in New Issue