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

common: don't enable debug log on ceph-volume calls by default 

ceph-volume can generate large logs at some point.

debug logs by definition should be enabled only when debugging.

Let's make it customizable with a variable which is set to `False` by
default.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 448cc280b7)
pull/5657/head
Guillaume Abrioux 2020-08-05 18:02:48 +02:00
parent fa0484d481
commit 88c9f6d969
12 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all.yml.sample
View File

@ -324,6 +324,8 @@ dummy:
#mon_host_v2:
# suffix: ':3300'
#enable_ceph_volume_debug: False
##########
# CEPHFS #
##########
@ -883,4 +885,4 @@ dummy:
#container_exec_cmd:
#docker: false
#ceph_volume_debug: "{{ enable_ceph_volume_debug | ternary(1, 0) }}"

4
group_vars/rhcs.yml.sample
View File

@ -324,6 +324,8 @@ ceph_iscsi_config_dev: false
#mon_host_v2:
# suffix: ':3300'
#enable_ceph_volume_debug: False
##########
# CEPHFS #
##########
@ -883,4 +885,4 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert
#container_exec_cmd:
#docker: false
#ceph_volume_debug: "{{ enable_ceph_volume_debug | ternary(1, 0) }}"

4
infrastructure-playbooks/filestore-to-bluestore.yml
View File

@ -217,7 +217,7 @@
osd_fsid: "{{ item.osd_fsid }}"
destroy: false
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
loop: "{{ osd_fsid_list }}"
@ -229,7 +229,7 @@
data: "{{ item.device }}"
destroy: true
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
loop: "{{ osd_fsid_list }}"

4
infrastructure-playbooks/purge-cluster.yml
View File

@ -499,7 +499,7 @@
wal_vg: "{{ item.wal_vg|default(omit) }}"
action: "zap"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
with_items: "{{ lvm_volumes }}"
when:
- lvm_volumes | default([]) | length > 0
@ -510,7 +510,7 @@
data: "{{ item }}"
action: "zap"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
with_items: "{{ devices | default([]) }}"
when:
- devices | default([]) | length > 0

4
infrastructure-playbooks/purge-container-cluster.yml
View File

@ -301,7 +301,7 @@
wal_vg: "{{ item.wal_vg|default(omit) }}"
action: "zap"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
with_items: "{{ lvm_volumes }}"
@ -312,7 +312,7 @@
data: "{{ item }}"
action: "zap"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
with_items: "{{ devices | default([]) }}"

4
infrastructure-playbooks/rolling_update.yml
View File

@ -407,7 +407,7 @@
- name: scan ceph-disk osds with ceph-volume if deploying nautilus
command: "ceph-volume --cluster={{ cluster }} simple scan --force"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
when:
- ceph_release in ["nautilus", "octopus"]
- not containerized_deployment | bool
@ -415,7 +415,7 @@
- name: activate scanned ceph-disk osds and migrate to ceph-volume if deploying nautilus
command: "ceph-volume --cluster={{ cluster }} simple activate --all"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
when:
- ceph_release in ["nautilus", "octopus"]
- not containerized_deployment | bool

2
infrastructure-playbooks/shrink-osd.yml
View File

@ -211,7 +211,7 @@
action: "zap"
osd_fsid: "{{ item.1 }}"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
delegate_to: "{{ item.0 }}"

2
infrastructure-playbooks/storage-inventory.yml
View File

@ -28,6 +28,6 @@
ceph_volume:
action: "inventory"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"

6
roles/ceph-config/tasks/main.yml
View File

@ -26,7 +26,7 @@
action: "inventory"
register: rejected_devices
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
PYTHONIOENCODING: utf-8
@ -53,7 +53,7 @@
action: "batch"
register: lvm_batch_report
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
PYTHONIOENCODING: utf-8
@ -73,7 +73,7 @@
action: "list"
register: lvm_list
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
PYTHONIOENCODING: utf-8

3
roles/ceph-defaults/defaults/main.yml
View File

@ -316,6 +316,8 @@ mon_host_v1:
mon_host_v2:
suffix: ':3300'
enable_ceph_volume_debug: False
##########
# CEPHFS #
##########
@ -875,3 +877,4 @@ use_fqdn_yes_i_am_sure: false
container_exec_cmd:
docker: false
ceph_volume_debug: "{{ enable_ceph_volume_debug | ternary(1, 0) }}"

2
roles/ceph-osd/tasks/scenarios/lvm-batch.yml
View File

@ -14,7 +14,7 @@
wal_devices: "{{ bluestore_wal_devices | unique if bluestore_wal_devices | length > 0 else omit }}"
action: "batch"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
PYTHONIOENCODING: utf-8

2
roles/ceph-osd/tasks/scenarios/lvm.yml
View File

@ -15,7 +15,7 @@
dmcrypt: "{{ dmcrypt|default(omit) }}"
action: "{{ 'prepare' if containerized_deployment else 'create' }}"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_VOLUME_DEBUG: "{{ ceph_volume_debug }}"
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
PYTHONIOENCODING: utf-8