From f7e92ee669d2cdb11ceebc85514ad5066023fb5f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 18 Jun 2020 10:02:11 -0700 Subject: [PATCH] Improve ansible yaml output for humans We use ansible's to_nice_yaml output filter when writing ansible datastructures to yaml. This has a default indent of 4, but we humans usually write yaml with an indent of 2. Make the generated yaml more similar to what us humans write and set the indent to 2. Change-Id: I3dc41b54e1b6480d7085261bc37c419009ef5ba7 --- playbooks/roles/nodepool-base/tasks/main.yaml | 2 +- playbooks/zuul/run-base.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/nodepool-base/tasks/main.yaml b/playbooks/roles/nodepool-base/tasks/main.yaml index 956a702ee5..055740a82f 100644 --- a/playbooks/roles/nodepool-base/tasks/main.yaml +++ b/playbooks/roles/nodepool-base/tasks/main.yaml @@ -67,7 +67,7 @@ - name: Write nodepool config copy: - content: "{{ nodepool_config | to_nice_yaml }}" + content: "{{ nodepool_config | to_nice_yaml(indent=2) }}" dest: /etc/nodepool/nodepool.yaml - name: Symlink in elements from project-config repo diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index c74b7612cf..caa54f7df4 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -103,7 +103,7 @@ # otherwise throws a j2 formatting exception. - name: Write out testinfra extra data fixture copy: - content: "{{ testinfra_extra_data | default('') | to_nice_yaml }}" + content: "{{ testinfra_extra_data | default('') | to_nice_yaml(indent=2) }}" dest: '/home/zuul/testinfra_extra_data_fixture.yaml' - name: Run testinfra to validate configuration