Skip to content

Commit

Permalink
Change yes/no to true/false, adhere to yamlspec 1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-de-bock committed Mar 18, 2024
1 parent abba578 commit 6485774
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/requirements2png.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ jobs:
uses: ad-m/github-push-action@master
with:
directory: ${{ github.repository }}
force: yes
force: true
branch: png
3 changes: 0 additions & 3 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ rules:
line-length: disable
truthy:
check-keys: no
allowed-values:
- "yes"
- "no"

ignore: |
.tox/
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

- name: Systemd daemon reload
ansible.builtin.systemd:
daemon_reload: yes
daemon_reload: true
notify:
- Restart rundeck

Expand Down
4 changes: 2 additions & 2 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
- name: Converge
hosts: all
become: yes
gather_facts: yes
become: true
gather_facts: true

roles:
- role: ansible-role-rundeck
4 changes: 2 additions & 2 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
- name: Prepare
hosts: all
become: yes
gather_facts: no
become: true
gather_facts: false

vars:
_java_version:
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/verify.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
- name: Verify
hosts: all
become: yes
gather_facts: yes
become: true
gather_facts: true

roles:
- robertdebock.core_dependencies
Expand Down
28 changes: 14 additions & 14 deletions tasks/assert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -15,31 +15,31 @@
- (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:
that:
- 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:
that:
- 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:
that:
- 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:
Expand All @@ -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:
Expand All @@ -57,30 +57,30 @@
- rundeck_port is number
- rundeck_port > 0
- rundeck_port < 65536
quiet: yes
quiet: true

- name: assert | Test rundeck_address
ansible.builtin.assert:
that:
- 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:
that:
- 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:
Expand All @@ -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 }}"
Expand All @@ -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
8 changes: 4 additions & 4 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -108,4 +108,4 @@
ansible.builtin.service:
name: rundeck
state: started
enabled: yes
enabled: true

0 comments on commit 6485774

Please sign in to comment.