mirror of https://github.com/ceph/ceph-ansible.git
remove all NBSPs on master branch
Similar to #3658 Since there's too many changes between master and stable branches let's commit directly in each branches instead of trying to backport this commit. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/3760/head v4.0.0rc1
parent
40a8e1160c
commit
f55e2b08be
|
@ -41,7 +41,7 @@
|
|||
- "{{ rbdmirror_group_name|default('rbdmirrors') }}"
|
||||
- "{{ nfs_group_name|default('nfss') }}"
|
||||
- "{{ client_group_name|default('clients') }}"
|
||||
- "{{ mgr_group_name|default('mgrs') }}"
|
||||
- "{{ mgr_group_name|default('mgrs') }}"
|
||||
|
||||
become: true
|
||||
|
||||
|
@ -383,7 +383,7 @@
|
|||
- name: wipe partitions
|
||||
shell: |
|
||||
wipefs --all "{{ item }}"
|
||||
dd if=/dev/zero of="{{ item }}" bs=1 count=4096
|
||||
dd if=/dev/zero of="{{ item }}" bs=1 count=4096
|
||||
with_items: "{{ combined_devices_list }}"
|
||||
|
||||
- name: zap ceph journal/block db/block wal partitions
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
when:
|
||||
- cephx
|
||||
- keys | length > 0
|
||||
- inventory_hostname == groups.get('_filtered_clients') | first
|
||||
- inventory_hostname == groups.get('_filtered_clients') | first
|
||||
|
||||
- name: slurp client cephx key(s)
|
||||
slurp:
|
||||
|
@ -65,7 +65,7 @@
|
|||
when:
|
||||
- cephx
|
||||
- keys | length > 0
|
||||
- inventory_hostname == groups.get('_filtered_clients') | first
|
||||
- inventory_hostname == groups.get('_filtered_clients') | first
|
||||
|
||||
- name: pool related tasks
|
||||
when:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
with_items:
|
||||
- "{{ groups.get(mon_group_name, []) }}"
|
||||
when:
|
||||
- "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
|
||||
- "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
|
||||
- ip_version == 'ipv4'
|
||||
- hostvars[item]['monitor_address_block'] | default('subnet') == 'subnet'
|
||||
- hostvars[item]['monitor_address'] | default('0.0.0.0') == '0.0.0.0'
|
||||
|
@ -37,7 +37,7 @@
|
|||
with_items:
|
||||
- "{{ groups.get(mon_group_name, []) }}"
|
||||
when:
|
||||
- "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
|
||||
- "item not in _monitor_addresses | default([]) | selectattr('name', 'defined') | map(attribute='name') | list"
|
||||
- ip_version == 'ipv6'
|
||||
- hostvars[item]['monitor_address_block'] | default('subnet') == 'subnet'
|
||||
- hostvars[item]['monitor_address'] | default('0.0.0.0') == '0.0.0.0'
|
||||
|
|
Loading…
Reference in New Issue