diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index b50fad3876..b5d9a7e6e3 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -410,7 +410,7 @@ state: absent when: not containerized_deployment | bool -- name: set osd flags +- name: set osd flag nodeep-scrub hosts: "{{ mon_group_name|default('mons') }}[0]" become: true gather_facts: false @@ -418,12 +418,9 @@ - import_role: name: ceph-defaults - - name: set osd flags - command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd set {{ item }}" + - name: set osd flag nodeep-scrub + command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd set nodeep-scrub" changed_when: false - with_items: - - noout - - nodeep-scrub environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' @@ -441,6 +438,12 @@ tasks_from: container_binary.yml when: containerized_deployment | bool + - name: set osd flag noout + command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd set-group noout {{ inventory_hostname }}" + changed_when: false + environment: + CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' + - name: get osd list ceph_volume: cluster: "{{ cluster }}" @@ -509,7 +512,13 @@ environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' -- name: unset osd flags + - name: unset osd flag noout + command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd unset-group noout {{ inventory_hostname }}" + changed_when: false + environment: + CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' + +- name: unset osd flag nodeep-scrub hosts: "{{ mon_group_name|default('mons') }}[0]" become: true gather_facts: false @@ -517,12 +526,9 @@ - import_role: name: ceph-defaults - - name: unset osd flags - command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd unset {{ item }}" + - name: unset osd flag nodeep-scrub + command: "{{ cephadm_cmd }} shell --fsid {{ fsid }} -- ceph --cluster {{ cluster }} osd unset nodeep-scrub" changed_when: false - with_items: - - noout - - nodeep-scrub environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 0213fb1b52..34cdb2d6ac 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -335,7 +335,7 @@ name: ceph-mgr -- name: set osd flags +- name: set osd flag nodeep-scrub hosts: "{{ mon_group_name | default('mons') }}[0]" become: True tasks: @@ -345,16 +345,13 @@ name: ceph-facts tasks_from: container_binary.yml - - name: set osd flags + - name: set osd flag nodeep-scrub ceph_osd_flag: - name: "{{ item }}" + name: "nodeep-scrub" cluster: "{{ cluster }}" environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" - with_items: - - noout - - nodeep-scrub - name: upgrade ceph osds cluster vars: @@ -371,6 +368,17 @@ - import_role: name: ceph-facts + - name: set osd flag noout + ceph_osd_flag: + name: noout + level: bucket + bucket: "{{ inventory_hostname }}" + cluster: "{{ cluster }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + environment: + CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" + CEPH_CONTAINER_BINARY: "{{ container_binary }}" + - name: get osd numbers - non container shell: if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi # noqa 306 register: osd_ids @@ -440,6 +448,18 @@ delay: "{{ health_osd_check_delay }}" when: (ceph_pgs.stdout | from_json).pg_summary.num_pgs != 0 + - name: unset osd flag noout + ceph_osd_flag: + name: noout + state: absent + level: bucket + bucket: "{{ inventory_hostname }}" + cluster: "{{ cluster }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + environment: + CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" + CEPH_CONTAINER_BINARY: "{{ container_binary }}" + - name: complete osd upgrade hosts: "{{ mon_group_name|default('mons') }}[0]" @@ -451,17 +471,14 @@ name: ceph-facts tasks_from: container_binary.yml - - name: unset osd flags + - name: unset osd flag nodeep-scrub ceph_osd_flag: - name: "{{ item }}" + name: "nodeep-scrub" cluster: "{{ cluster }}" state: absent environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" - with_items: - - noout - - nodeep-scrub - name: upgrade ceph mdss cluster, deactivate all rank > 0 hosts: "{{ mon_group_name | default('mons') }}[0]" diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 67e5fefb68..973d5a984d 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -201,7 +201,7 @@ name: ceph-mgr -- name: set osd flags +- name: set osd flag nodeep-scrub hosts: "{{ mon_group_name | default('mons') }}[0]" become: True tasks: @@ -211,16 +211,13 @@ name: ceph-facts tasks_from: container_binary.yml - - name: set osd flags + - name: set osd flag nodeep-scrub ceph_osd_flag: - name: "{{ item }}" + name: "nodeep-scrub" cluster: "{{ cluster }}" environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" - with_items: - - noout - - nodeep-scrub - name: switching from non-containerized to containerized ceph osd @@ -239,6 +236,21 @@ - import_role: name: ceph-defaults + - import_role: + name: ceph-facts + tasks_from: container_binary.yml + + - name: set osd flag noout + ceph_osd_flag: + name: noout + level: bucket + bucket: "{{ inventory_hostname }}" + cluster: "{{ cluster }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + environment: + CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" + CEPH_CONTAINER_BINARY: "{{ container_binary }}" + - name: collect running osds shell: | set -o pipefail; @@ -351,8 +363,19 @@ delay: "{{ health_osd_check_delay }}" changed_when: false + - name: unset osd flag noout + ceph_osd_flag: + name: noout + state: absent + level: bucket + bucket: "{{ inventory_hostname }}" + cluster: "{{ cluster }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + environment: + CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" + CEPH_CONTAINER_BINARY: "{{ container_binary }}" -- name: unset osd flags +- name: unset osd flag nodeep-scrub hosts: "{{ mon_group_name | default('mons') }}[0]" become: True tasks: @@ -362,17 +385,14 @@ name: ceph-facts tasks_from: container_binary.yml - - name: set osd flags + - name: set osd flag nodeep-scrub ceph_osd_flag: - name: "{{ item }}" + name: "nodeep-scrub" cluster: "{{ cluster }}" state: absent environment: CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}" - with_items: - - noout - - nodeep-scrub - name: switching from non-containerized to containerized ceph mds