From 3d766af7e901818d42c295f919a0fa2e9008347d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 28 Jul 2022 15:21:52 +1000 Subject: [PATCH] linters: minor cosmetic updates Make sure all blocks are named, and fix up whitespace around jinja filters. Change-Id: Iaaeca20d53a927fab660f45b5bb9b552a15146e2 --- roles/build-pdf-docs/tasks/main.yaml | 2 +- roles/configure-swap/tasks/root.yaml | 3 ++- roles/set-service-type-data-fact/tasks/main.yaml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/build-pdf-docs/tasks/main.yaml b/roles/build-pdf-docs/tasks/main.yaml index c719f698..75ff324e 100644 --- a/roles/build-pdf-docs/tasks/main.yaml +++ b/roles/build-pdf-docs/tasks/main.yaml @@ -18,7 +18,7 @@ - name: Run tox with output redirected to a file args: chdir: "{{ zuul_work_dir }}" - environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}" + environment: "{{ tox_environment | combine(tox_constraints_env | default({})) }}" shell: | echo "Running {{ tox_executable }} -e {{ tox_pdf_envlist }} -vv > {{ ansible_user_dir }}/zuul-output/logs/sphinx-build-pdf.log 2>&1" echo "Output is redirected to a file as it tends to be quite verbose." diff --git a/roles/configure-swap/tasks/root.yaml b/roles/configure-swap/tasks/root.yaml index a8e52b4b..bc2ac566 100644 --- a/roles/configure-swap/tasks/root.yaml +++ b/roles/configure-swap/tasks/root.yaml @@ -6,7 +6,8 @@ set_fact: swap_required: "{{ configure_swap_size - ansible_memory_mb['swap']['total'] | int }}" -- block: +- name: Get root filesystem + block: - name: Get root filesystem shell: df --output='fstype' /root | tail -1 register: root_fs diff --git a/roles/set-service-type-data-fact/tasks/main.yaml b/roles/set-service-type-data-fact/tasks/main.yaml index d4290828..927ccb9d 100644 --- a/roles/set-service-type-data-fact/tasks/main.yaml +++ b/roles/set-service-type-data-fact/tasks/main.yaml @@ -4,7 +4,8 @@ body_format: json register: service_types -- block: +- name: Set service_type_data fact + block: - name: Set service_type_data fact set_fact: service_type_data: "{{ service_types['json']['primary_service_by_project'][zuul.project.short_name] }}"