Auto-fix yaml rules

In order to reduce divergance with ansible-lint rules, we apply
auto-fixing of violations.

In current patch we replace all kind of truthy variables with
`true` or `false` values to align with recommendations along with
alignment of used quotes.

Change-Id: Ie295a52b403df4d404bf984fe0296d5be110f532
This commit is contained in:
Dmitriy Rabotyagov
2025-02-13 08:41:52 +01:00
parent 45f6078fe5
commit 6afb2944dc
12 changed files with 39 additions and 37 deletions

1
.gitignore vendored
View File

@@ -45,6 +45,7 @@ logs/*
# OS generated files # # OS generated files #
###################### ######################
._* ._*
.ansible
.tox .tox
*.egg-info *.egg-info
.eggs .eggs

View File

@@ -34,7 +34,7 @@ rabbit_system_user_name: rabbitmq
rabbit_system_group_name: rabbitmq rabbit_system_group_name: rabbitmq
# Allow role to adjust /etc/hosts file # Allow role to adjust /etc/hosts file
rabbitmq_manage_hosts_entries: True rabbitmq_manage_hosts_entries: true
# Hosts file entries # Hosts file entries
rabbitmq_hosts_entries: >- rabbitmq_hosts_entries: >-
@@ -120,7 +120,7 @@ rabbitmq_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}"
# Create a certificate authority if one does not already exist # Create a certificate authority if one does not already exist
rabbitmq_pki_create_ca: "{{ openstack_pki_authorities is not defined | bool }}" rabbitmq_pki_create_ca: "{{ openstack_pki_authorities is not defined | bool }}"
rabbitmq_pki_regen_ca: '' rabbitmq_pki_regen_ca: ""
rabbitmq_pki_authorities: rabbitmq_pki_authorities:
- name: "RabbitMQRoot" - name: "RabbitMQRoot"
country: "GB" country: "GB"
@@ -161,7 +161,7 @@ rabbitmq_pki_certs_path: "{{ rabbitmq_pki_dir ~ '/certs/certs/' }}"
rabbitmq_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('RabbitMQIntermediate') }}" rabbitmq_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('RabbitMQIntermediate') }}"
rabbitmq_pki_intermediate_cert_path: >- rabbitmq_pki_intermediate_cert_path: >-
{{ rabbitmq_pki_dir ~ '/roots/' ~ rabbitmq_pki_intermediate_cert_name ~ '/certs/' ~ rabbitmq_pki_intermediate_cert_name ~ '.crt' }} {{ rabbitmq_pki_dir ~ '/roots/' ~ rabbitmq_pki_intermediate_cert_name ~ '/certs/' ~ rabbitmq_pki_intermediate_cert_name ~ '.crt' }}
rabbitmq_pki_regen_cert: '' rabbitmq_pki_regen_cert: ""
rabbitmq_pki_certificates: rabbitmq_pki_certificates:
- name: "rabbitmq_{{ ansible_facts['hostname'] }}" - name: "rabbitmq_{{ ansible_facts['hostname'] }}"
provider: ownca provider: ownca
@@ -210,7 +210,7 @@ rabbitmq_ssl_tls_versions:
# Mutual TLS control # Mutual TLS control
rabbitmq_ssl_verify: "verify_none" rabbitmq_ssl_verify: "verify_none"
rabbitmq_ssl_fail_if_no_peer_cert: False rabbitmq_ssl_fail_if_no_peer_cert: false
# Recommended ciphers taken from https://www.rabbitmq.com/ssl.html # Recommended ciphers taken from https://www.rabbitmq.com/ssl.html
rabbitmq_ssl_ciphers: rabbitmq_ssl_ciphers:
@@ -253,16 +253,16 @@ rabbitmq_management_ssl: true
rabbitmq_management_rates_mode: basic rabbitmq_management_rates_mode: basic
# Precompile RabbitMQ with HiPE # Precompile RabbitMQ with HiPE
rabbitmq_hipe_compile: False rabbitmq_hipe_compile: false
# Disable non-TLS listeners # Disable non-TLS listeners
rabbitmq_disable_non_tls_listeners: False rabbitmq_disable_non_tls_listeners: false
# RabbitMQ logging options # RabbitMQ logging options
# See https://www.rabbitmq.com/logging.html for the logging options # See https://www.rabbitmq.com/logging.html for the logging options
rabbitmq_log: rabbitmq_log:
journald: True journald: true
file: False file: false
# RabbitMQ policies # RabbitMQ policies
# Used to tune performance characteristics of OpenStack messaging # Used to tune performance characteristics of OpenStack messaging
@@ -295,10 +295,10 @@ rabbitmq_log:
# state: absent # state: absent
# #
rabbitmq_policies: [] rabbitmq_policies: []
rabbitmq_apply_openstack_policies: False rabbitmq_apply_openstack_policies: false
rabbitmq_openstack_policies: rabbitmq_openstack_policies:
- name: CQv2 - name: CQv2
pattern: '.*' pattern: ".*"
priority: 0 priority: 0
tags: tags:
queue-version: 2 queue-version: 2

View File

@@ -1,3 +1,4 @@
---
- name: Install RabbitMQ server - name: Install RabbitMQ server
hosts: rabbitmq_all hosts: rabbitmq_all
user: root user: root

View File

@@ -25,7 +25,7 @@
service: service:
name: rabbitmq-server name: rabbitmq-server
state: started state: started
enabled: yes enabled: true
listen: listen:
- RabbitMQ start - RabbitMQ start
- RabbitMQ restart - RabbitMQ restart

View File

@@ -14,12 +14,12 @@ platforms:
privileged: true privileged: true
pre_build_image: true pre_build_image: true
docker_networks: docker_networks:
- name: 'rabbitmq' - name: "rabbitmq"
ipam_config: ipam_config:
- subnet: '10.1.0.0/24' - subnet: "10.1.0.0/24"
networks: networks:
- name: "rabbitmq" - name: "rabbitmq"
ipv4_address: '10.1.0.2' ipv4_address: "10.1.0.2"
- name: rabbitmq02 - name: rabbitmq02
groups: groups:
- rabbitmq_all - rabbitmq_all
@@ -28,12 +28,12 @@ platforms:
privileged: true privileged: true
pre_build_image: true pre_build_image: true
docker_networks: docker_networks:
- name: 'rabbitmq' - name: "rabbitmq"
ipam_config: ipam_config:
- subnet: '10.1.0.0/24' - subnet: "10.1.0.0/24"
networks: networks:
- name: "rabbitmq" - name: "rabbitmq"
ipv4_address: '10.1.0.3' ipv4_address: "10.1.0.3"
- name: rabbitmq03 - name: rabbitmq03
groups: groups:
- rabbitmq_all - rabbitmq_all
@@ -42,20 +42,20 @@ platforms:
privileged: true privileged: true
pre_build_image: true pre_build_image: true
docker_networks: docker_networks:
- name: 'rabbitmq' - name: "rabbitmq"
ipam_config: ipam_config:
- subnet: '10.1.0.0/24' - subnet: "10.1.0.0/24"
networks: networks:
- name: "rabbitmq" - name: "rabbitmq"
ipv4_address: '10.1.0.4' ipv4_address: "10.1.0.4"
provisioner: provisioner:
name: ansible name: ansible
inventory: inventory:
group_vars: group_vars:
rabbitmq_all: rabbitmq_all:
rabbitmq_apply_openstack_policies: True rabbitmq_apply_openstack_policies: true
rabbitmq_cookie_token: secrete rabbitmq_cookie_token: secrete
rabbitmq_manage_hosts_entries: False rabbitmq_manage_hosts_entries: false
rabbitmq_pki_dir: /tmp/pki/rabbitmq-ca rabbitmq_pki_dir: /tmp/pki/rabbitmq-ca
host_vars: host_vars:
rabbitmq01: rabbitmq01:

View File

@@ -84,14 +84,14 @@
- name: Update apt repositories when config is changed - name: Update apt repositories when config is changed
apt: apt:
update_cache: yes update_cache: true
when: (apt_repo_removed is changed) or (deb822_repos is changed) when: (apt_repo_removed is changed) or (deb822_repos is changed)
- name: Install RabbitMQ package dependencies - name: Install RabbitMQ package dependencies
apt: apt:
pkg: "{{ rabbitmq_dependencies }}" pkg: "{{ rabbitmq_dependencies }}"
state: "{{ rabbitmq_package_state }}" state: "{{ rabbitmq_package_state }}"
update_cache: yes update_cache: true
cache_valid_time: "{{ cache_timeout }}" cache_valid_time: "{{ cache_timeout }}"
register: install_packages register: install_packages
until: install_packages is success until: install_packages is success

View File

@@ -16,8 +16,8 @@
- name: "Gather cluster status" - name: "Gather cluster status"
command: "rabbitmqctl cluster_status --formatter json" command: "rabbitmqctl cluster_status --formatter json"
register: _cluster_status register: _cluster_status
changed_when: False changed_when: false
failed_when: False failed_when: false
- name: Define cluster_state fact - name: Define cluster_state fact
set_fact: set_fact:

View File

@@ -16,14 +16,14 @@
- name: "Check for disabled RabbitMQ feature flags" - name: "Check for disabled RabbitMQ feature flags"
command: "rabbitmqctl list_feature_flags --formatter json name state stability" command: "rabbitmqctl list_feature_flags --formatter json name state stability"
register: _feature_flags register: _feature_flags
changed_when: False changed_when: false
failed_when: False failed_when: false
# NOTE: changed_when required despite the above check because 'unstable' # NOTE: changed_when required despite the above check because 'unstable'
# feature flags will remain disabled each time this runs # feature flags will remain disabled each time this runs
- name: "Enable missing RabbitMQ feature flags" - name: "Enable missing RabbitMQ feature flags"
command: "rabbitmqctl enable_feature_flag {{ flag['name'] }}" command: "rabbitmqctl enable_feature_flag {{ flag['name'] }}"
changed_when: False changed_when: false
loop: "{{ _feature_flags.stdout | from_json | rejectattr('stability', 'eq', 'experimental') | selectattr('state', 'eq', 'disabled') }}" loop: "{{ _feature_flags.stdout | from_json | rejectattr('stability', 'eq', 'experimental') | selectattr('state', 'eq', 'disabled') }}"
loop_control: loop_control:
loop_var: flag loop_var: flag

View File

@@ -29,7 +29,7 @@
- name: Reload the systemd daemon - name: Reload the systemd daemon
systemd: systemd:
daemon_reload: yes daemon_reload: true
when: when:
- install_rabbitmq is changed - install_rabbitmq is changed
tags: tags:

View File

@@ -47,13 +47,13 @@
lineinfile: lineinfile:
dest: /etc/hosts dest: /etc/hosts
state: present state: present
line: '127.0.0.1 localhost' line: "127.0.0.1 localhost"
regexp: '^127\.0\.0\.1' regexp: "^127\\.0\\.0\\.1"
- name: Remove hostname record for 127.0.1.1 - name: Remove hostname record for 127.0.1.1
replace: replace:
path: /etc/hosts path: /etc/hosts
regexp: '^(127\.0\.1\.1)\s*(\S*)\s*({{ ansible_facts["hostname"] }})($|\s.*)' regexp: '^(127\.0\.1\.1)\s*(\S*)\s*({{ ansible_facts["hostname"] }})($|\s.*)'
replace: '\1 \2 \4' replace: "\\1 \\2 \\4"
when: when:
- rabbitmq_manage_hosts_entries | bool - rabbitmq_manage_hosts_entries | bool
tags: tags:

View File

@@ -18,14 +18,14 @@
src: "policy-rc.d" src: "policy-rc.d"
dest: "/usr/sbin/policy-rc.d" dest: "/usr/sbin/policy-rc.d"
mode: "0755" mode: "0755"
backup: yes backup: true
tags: tags:
- rabbitmq-policy-file - rabbitmq-policy-file
- rabbitmq-upgrade - rabbitmq-upgrade
- name: Set node for maintenance state - name: Set node for maintenance state
command: rabbitmq-upgrade drain --quiet command: rabbitmq-upgrade drain --quiet
changed_when: False changed_when: false
- name: Pause to allow node to sync - name: Pause to allow node to sync
pause: pause:

View File

@@ -29,7 +29,7 @@ _rabbitmq_repo:
baseurl: "{{ rabbitmq_repo_url }}" baseurl: "{{ rabbitmq_repo_url }}"
filename: RabbitMQ filename: RabbitMQ
state: "{{ (rabbitmq_install_method == 'external_repo') | ternary('present', 'absent') }}" state: "{{ (rabbitmq_install_method == 'external_repo') | ternary('present', 'absent') }}"
gpgcheck: yes gpgcheck: true
gpgkey: gpgkey:
- https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
- https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key
@@ -42,7 +42,7 @@ _rabbitmq_erlang_repo:
baseurl: "{{ rabbitmq_erlang_repo_url }}" baseurl: "{{ rabbitmq_erlang_repo_url }}"
filename: els-erlang filename: els-erlang
state: "{{ (rabbitmq_erlang_install_method == 'external_repo') | ternary('present', 'absent') }}" state: "{{ (rabbitmq_erlang_install_method == 'external_repo') | ternary('present', 'absent') }}"
gpgcheck: yes gpgcheck: true
gpgkey: gpgkey:
- https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key
- https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc