ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: remove unnecessary run_once statements 

1303611 introduced tasks for disabling the pg_autoscaler on pools and
the balancer but thoses tasks are already executed on the first monitor
node so we don't need to add the run_once statement.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 738fa9428a)
pull/6746/head
Dimitri Savineau 2021-07-20 11:38:44 -04:00 committed by Dimitri Savineau
parent f9d60644ad
commit 06158c2ac5
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infrastructure-playbooks/rolling_update.yml
View File

@ -394,18 +394,15 @@
- name: get balancer module status - name: get balancer module status
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json"
register: balancer_status register: balancer_status
run_once: true
changed_when: false changed_when: false
- name: set_fact pools_pgautoscaler_mode - name: set_fact pools_pgautoscaler_mode
set_fact: set_fact:
pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}" pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}"
run_once: true
with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}"
- name: disable balancer - name: disable balancer
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off"
run_once: true
changed_when: false changed_when: false
when: (balancer_status.stdout | from_json)['active'] | bool when: (balancer_status.stdout | from_json)['active'] | bool
@ -415,7 +412,6 @@
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_autoscale_mode: false pg_autoscale_mode: false
with_items: "{{ pools_pgautoscaler_mode }}" with_items: "{{ pools_pgautoscaler_mode }}"
run_once: true
when: when:
- pools_pgautoscaler_mode is defined - pools_pgautoscaler_mode is defined
- item.mode == 'on' - item.mode == 'on'
@ -536,7 +532,6 @@
name: "{{ item.name }}" name: "{{ item.name }}"
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_autoscale_mode: true pg_autoscale_mode: true
run_once: true
with_items: "{{ pools_pgautoscaler_mode }}" with_items: "{{ pools_pgautoscaler_mode }}"
when: when:
- pools_pgautoscaler_mode is defined - pools_pgautoscaler_mode is defined
@ -559,7 +554,6 @@
- name: re-enable balancer - name: re-enable balancer
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on"
run_once: true
changed_when: false changed_when: false
when: (balancer_status.stdout | from_json)['active'] | bool when: (balancer_status.stdout | from_json)['active'] | bool

7
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
View File

@ -218,24 +218,20 @@
- name: get pool list - name: get pool list
command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json" command: "{{ ceph_cmd }} --cluster {{ cluster }} osd dump -f json"
register: pool_list register: pool_list
run_once: true
changed_when: false changed_when: false
- name: get balancer module status - name: get balancer module status
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer status -f json"
register: balancer_status register: balancer_status
run_once: true
changed_when: false changed_when: false
- name: set_fact pools_pgautoscaler_mode - name: set_fact pools_pgautoscaler_mode
set_fact: set_fact:
pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}" pools_pgautoscaler_mode: "{{ pools_pgautoscaler_mode | default([]) | union([{'name': item.pool_name, 'mode': item.pg_autoscale_mode}]) }}"
run_once: true
with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}" with_items: "{{ (pool_list.stdout | default('{}') | from_json)['pools'] }}"
- name: disable balancer - name: disable balancer
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer off"
run_once: true
changed_when: false changed_when: false
when: (balancer_status.stdout | from_json)['active'] | bool when: (balancer_status.stdout | from_json)['active'] | bool
@ -245,7 +241,6 @@
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_autoscale_mode: false pg_autoscale_mode: false
with_items: "{{ pools_pgautoscaler_mode }}" with_items: "{{ pools_pgautoscaler_mode }}"
run_once: true
when: when:
- pools_pgautoscaler_mode is defined - pools_pgautoscaler_mode is defined
- item.mode == 'on' - item.mode == 'on'
@ -410,7 +405,6 @@
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_autoscale_mode: true pg_autoscale_mode: true
with_items: "{{ pools_pgautoscaler_mode }}" with_items: "{{ pools_pgautoscaler_mode }}"
run_once: true
when: when:
- pools_pgautoscaler_mode is defined - pools_pgautoscaler_mode is defined
- item.mode == 'on' - item.mode == 'on'
@ -432,7 +426,6 @@
- name: re-enable balancer - name: re-enable balancer
command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on" command: "{{ ceph_cmd }} --cluster {{ cluster }} balancer on"
run_once: true
changed_when: false changed_when: false
when: (balancer_status.stdout | from_json)['active'] | bool when: (balancer_status.stdout | from_json)['active'] | bool