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 c2abea9..4d8f20d 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.rundeck @@ -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 vars: _java_version: @@ -119,7 +119,7 @@ rundeck_framework: # - parameter: "framework.log.dispatch.console.format" # value: unset - parameter: framework.rundeck.execution.script.tokenexpansion.enabled - value: yes + value: true # default users stored in {{ rundeck_rdeckbase }}/server/config/realm.properties rundeck_users: diff --git a/defaults/main.yml b/defaults/main.yml index ed19c53..1f61354 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -67,7 +67,7 @@ rundeck_framework: # - parameter: "framework.log.dispatch.console.format" # value: unset - parameter: framework.rundeck.execution.script.tokenexpansion.enabled - value: yes + value: true # default users stored in {{ rundeck_rdeckbase }}/server/config/realm.properties rundeck_users: diff --git a/handlers/main.yml b/handlers/main.yml index e6c663a..c5beebb 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,7 +3,7 @@ - name: Systemd daemon reload ansible.builtin.systemd: - daemon_reload: yes + daemon_reload: true notify: - Restart rundeck diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 96f7d37..47351e6 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-rundeck diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 06e6136..6187782 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 vars: _java_version: diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 2a86812..795b31f 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -1,8 +1,8 @@ --- - name: Verify hosts: all - become: yes - gather_facts: yes + become: true + gather_facts: true roles: - robertdebock.core_dependencies diff --git a/tasks/assert.yml b/tasks/assert.yml index cf1f87f..56c96fe 100644 --- a/tasks/assert.yml +++ b/tasks/assert.yml @@ -6,7 +6,7 @@ - rundeck_version is defined - rundeck_version is string - rundeck_version is not none - quiet: yes + quiet: true - name: assert | Test rundeck_release_date ansible.builtin.assert: @@ -15,7 +15,7 @@ - (rundeck_release_date is number and rundeck_release_date > 0) or rundeck_release_date is string - rundeck_release_date is not none - quiet: yes + quiet: true - name: assert | Test rundeck_rdeckbase ansible.builtin.assert: @@ -23,7 +23,7 @@ - rundeck_rdeckbase is defined - rundeck_rdeckbase is string - rundeck_rdeckbase is not none - quiet: yes + quiet: true - name: assert | Test rundeck_xmx ansible.builtin.assert: @@ -31,7 +31,7 @@ - rundeck_xmx is defined - rundeck_xmx is number - rundeck_xmx > rundeck_xms | int - quiet: yes + quiet: true - name: assert | Test rundeck_xms ansible.builtin.assert: @@ -39,7 +39,7 @@ - rundeck_xms is defined - rundeck_xms is number - rundeck_xms < rundeck_xmx | int - quiet: yes + quiet: true - name: assert | Test rundeck_maxmetaspacesize ansible.builtin.assert: @@ -48,7 +48,7 @@ - rundeck_maxmetaspacesize is number - rundeck_maxmetaspacesize < rundeck_xms | int - rundeck_maxmetaspacesize < rundeck_xmx | int - quiet: yes + quiet: true - name: assert | Test rundeck_port ansible.builtin.assert: @@ -57,7 +57,7 @@ - rundeck_port is number - rundeck_port > 0 - rundeck_port < 65536 - quiet: yes + quiet: true - name: assert | Test rundeck_address ansible.builtin.assert: @@ -65,7 +65,7 @@ - rundeck_address is defined - rundeck_address is string - rundeck_address is not none - quiet: yes + quiet: true - name: assert | Test rundeck_url ansible.builtin.assert: @@ -73,14 +73,14 @@ - rundeck_url is defined - rundeck_url is string - rundeck_url is not none - quiet: yes + quiet: true - name: assert | Test rundeck_config ansible.builtin.assert: that: - rundeck_config is defined - rundeck_config is iterable - quiet: yes + quiet: true - name: assert | Test item in rundeck_config ansible.builtin.assert: @@ -89,7 +89,7 @@ - item.parameter is string - item.parameter is not none - item.value is defined - quiet: yes + quiet: true loop: "{{ rundeck_config }}" loop_control: label: "{{ item.parameter }}" @@ -99,18 +99,18 @@ that: - rundeck_framework is defined - rundeck_framework is iterable - quiet: yes + quiet: true - name: assert | Test rundeck_users ansible.builtin.assert: that: - rundeck_users is defined - rundeck_users is iterable - quiet: yes + quiet: true - name: assert | Test rundeck_plugins ansible.builtin.assert: that: - rundeck_plugins is defined - rundeck_plugins is iterable - quiet: yes + quiet: true diff --git a/tasks/main.yml b/tasks/main.yml index 9d32f2d..9d14310 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,7 +4,7 @@ - name: Import assert.yml ansible.builtin.import_tasks: file: assert.yml - run_once: yes + run_once: true delegate_to: localhost - name: Create rundeck directories @@ -44,7 +44,7 @@ dest: "{{ rundeck_rdeckbase }}/server/config/rundeck-config.properties" line: "{{ item.parameter }} = {{ item.value }}" regexp: "^{{ item.parameter }}" - create: yes + create: true mode: "0644" loop: "{{ rundeck_config }}" loop_control: @@ -57,7 +57,7 @@ dest: "{{ rundeck_rdeckbase }}/etc/framework.properties" line: "{{ item.parameter }} = {{ item.value }}" regexp: "^{{ item.parameter }}" - create: yes + create: true mode: "0644" loop: "{{ rundeck_framework }}" loop_control: @@ -108,4 +108,4 @@ ansible.builtin.service: name: rundeck state: started - enabled: yes + enabled: true