From 6e229ce282e863a9b8167e93c23c9eb63e36ea9d Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Mon, 18 Mar 2024 10:17:04 +0100 Subject: [PATCH] Change yes/no to true/false, adhere to yamlspec 1.2.2 --- .github/workflows/requirements2png.yml | 2 +- .yamllint | 3 --- README.md | 8 ++++---- handlers/main.yml | 2 +- molecule/default/converge.yml | 4 ++-- molecule/default/prepare.yml | 4 ++-- molecule/default/verify.yml | 4 ++-- tasks/assert.yml | 2 +- vars/main.yml | 4 ++-- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/requirements2png.yml b/.github/workflows/requirements2png.yml index a132e12..f12e0c3 100644 --- a/.github/workflows/requirements2png.yml +++ b/.github/workflows/requirements2png.yml @@ -31,5 +31,5 @@ jobs: uses: ad-m/github-push-action@master with: directory: ${{ github.repository }} - force: yes + force: true branch: png diff --git a/.yamllint b/.yamllint index 10d5946..cc50726 100644 --- a/.yamllint +++ b/.yamllint @@ -11,9 +11,6 @@ rules: line-length: disable truthy: check-keys: no - allowed-values: - - "yes" - - "no" ignore: | .tox/ diff --git a/README.md b/README.md index 645fe79..3df1929 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ This example is taken from [`molecule/default/converge.yml`](https://github.com/ --- - name: Converge hosts: all - become: yes - gather_facts: yes + become: true + gather_facts: true roles: - role: robertdebock.epel @@ -27,8 +27,8 @@ The machine needs to be prepared. In CI this is done using [`molecule/default/pr --- - name: Prepare hosts: all - become: yes - gather_facts: no + become: true + gather_facts: false roles: - role: robertdebock.bootstrap diff --git a/handlers/main.yml b/handlers/main.yml index 680bfb2..e2ce070 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,4 +3,4 @@ - name: Update package cache ansible.builtin.package: - update_cache: yes + update_cache: true diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index edaa8ef..af7d968 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,8 +1,8 @@ --- - name: Converge hosts: all - become: yes - gather_facts: yes + become: true + gather_facts: true roles: - role: ansible-role-epel diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index f76c7bf..3687735 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -1,8 +1,8 @@ --- - name: Prepare hosts: all - become: yes - gather_facts: no + become: true + gather_facts: false roles: - role: robertdebock.bootstrap diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index ad11c75..1c15db6 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -1,8 +1,8 @@ --- - name: Verify hosts: all - become: yes - gather_facts: no + become: true + gather_facts: false tasks: - name: Install a package from epel diff --git a/tasks/assert.yml b/tasks/assert.yml index 204838f..ed4307a 100644 --- a/tasks/assert.yml +++ b/tasks/assert.yml @@ -2,7 +2,7 @@ - name: assert | Ensure that `epel_next`. ansible.builtin.assert: - quiet: yes + quiet: true that: - epel_next is defined - epel_next is bool diff --git a/vars/main.yml b/vars/main.yml index 9206099..900a75c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -17,7 +17,7 @@ epel_gpg_key: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ epel_ve # Whether to install the new `epel-next` repository. This is only installed by default # on CentOS Stream, as per https://docs.fedoraproject.org/en-US/epel/#_quickstart. _epel_next: - default: no - Stream: yes + default: false + Stream: true epel_next: "{{ _epel_next[ansible_distribution_release] | default(_epel_next['default']) }}"