From 6afb2944dc238cbb4d22e4b10905f69683b9d87b Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 13 Feb 2025 08:41:52 +0100 Subject: [PATCH] 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 --- .gitignore | 1 + defaults/main.yml | 20 ++++++++++---------- examples/playbook.yml | 1 + handlers/main.yml | 2 +- molecule/default/molecule.yml | 22 +++++++++++----------- tasks/install_apt.yml | 4 ++-- tasks/rabbitmq_cluster_state.yml | 4 ++-- tasks/rabbitmq_feature_flags.yml | 6 +++--- tasks/rabbitmq_install.yml | 2 +- tasks/rabbitmq_pre_install.yml | 6 +++--- tasks/rabbitmq_upgrade_prep.yml | 4 ++-- vars/redhat.yml | 4 ++-- 12 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 3a772066..c46a9ec6 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ logs/* # OS generated files # ###################### ._* +.ansible .tox *.egg-info .eggs diff --git a/defaults/main.yml b/defaults/main.yml index 9e76cd49..a363c0f1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -34,7 +34,7 @@ rabbit_system_user_name: rabbitmq rabbit_system_group_name: rabbitmq # Allow role to adjust /etc/hosts file -rabbitmq_manage_hosts_entries: True +rabbitmq_manage_hosts_entries: true # Hosts file 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 rabbitmq_pki_create_ca: "{{ openstack_pki_authorities is not defined | bool }}" -rabbitmq_pki_regen_ca: '' +rabbitmq_pki_regen_ca: "" rabbitmq_pki_authorities: - name: "RabbitMQRoot" 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_path: >- {{ 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: - name: "rabbitmq_{{ ansible_facts['hostname'] }}" provider: ownca @@ -210,7 +210,7 @@ rabbitmq_ssl_tls_versions: # Mutual TLS control 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 rabbitmq_ssl_ciphers: @@ -253,16 +253,16 @@ rabbitmq_management_ssl: true rabbitmq_management_rates_mode: basic # Precompile RabbitMQ with HiPE -rabbitmq_hipe_compile: False +rabbitmq_hipe_compile: false # Disable non-TLS listeners -rabbitmq_disable_non_tls_listeners: False +rabbitmq_disable_non_tls_listeners: false # RabbitMQ logging options # See https://www.rabbitmq.com/logging.html for the logging options rabbitmq_log: - journald: True - file: False + journald: true + file: false # RabbitMQ policies # Used to tune performance characteristics of OpenStack messaging @@ -295,10 +295,10 @@ rabbitmq_log: # state: absent # rabbitmq_policies: [] -rabbitmq_apply_openstack_policies: False +rabbitmq_apply_openstack_policies: false rabbitmq_openstack_policies: - name: CQv2 - pattern: '.*' + pattern: ".*" priority: 0 tags: queue-version: 2 diff --git a/examples/playbook.yml b/examples/playbook.yml index 323b15dc..638e773b 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -1,3 +1,4 @@ +--- - name: Install RabbitMQ server hosts: rabbitmq_all user: root diff --git a/handlers/main.yml b/handlers/main.yml index 9a151f14..f17da34f 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -25,7 +25,7 @@ service: name: rabbitmq-server state: started - enabled: yes + enabled: true listen: - RabbitMQ start - RabbitMQ restart diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 9f53487b..dfc8d920 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -14,12 +14,12 @@ platforms: privileged: true pre_build_image: true docker_networks: - - name: 'rabbitmq' + - name: "rabbitmq" ipam_config: - - subnet: '10.1.0.0/24' + - subnet: "10.1.0.0/24" networks: - name: "rabbitmq" - ipv4_address: '10.1.0.2' + ipv4_address: "10.1.0.2" - name: rabbitmq02 groups: - rabbitmq_all @@ -28,12 +28,12 @@ platforms: privileged: true pre_build_image: true docker_networks: - - name: 'rabbitmq' + - name: "rabbitmq" ipam_config: - - subnet: '10.1.0.0/24' + - subnet: "10.1.0.0/24" networks: - name: "rabbitmq" - ipv4_address: '10.1.0.3' + ipv4_address: "10.1.0.3" - name: rabbitmq03 groups: - rabbitmq_all @@ -42,20 +42,20 @@ platforms: privileged: true pre_build_image: true docker_networks: - - name: 'rabbitmq' + - name: "rabbitmq" ipam_config: - - subnet: '10.1.0.0/24' + - subnet: "10.1.0.0/24" networks: - name: "rabbitmq" - ipv4_address: '10.1.0.4' + ipv4_address: "10.1.0.4" provisioner: name: ansible inventory: group_vars: rabbitmq_all: - rabbitmq_apply_openstack_policies: True + rabbitmq_apply_openstack_policies: true rabbitmq_cookie_token: secrete - rabbitmq_manage_hosts_entries: False + rabbitmq_manage_hosts_entries: false rabbitmq_pki_dir: /tmp/pki/rabbitmq-ca host_vars: rabbitmq01: diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml index e5d1d415..642c7c1c 100644 --- a/tasks/install_apt.yml +++ b/tasks/install_apt.yml @@ -84,14 +84,14 @@ - name: Update apt repositories when config is changed apt: - update_cache: yes + update_cache: true when: (apt_repo_removed is changed) or (deb822_repos is changed) - name: Install RabbitMQ package dependencies apt: pkg: "{{ rabbitmq_dependencies }}" state: "{{ rabbitmq_package_state }}" - update_cache: yes + update_cache: true cache_valid_time: "{{ cache_timeout }}" register: install_packages until: install_packages is success diff --git a/tasks/rabbitmq_cluster_state.yml b/tasks/rabbitmq_cluster_state.yml index 08a5825f..1e306503 100644 --- a/tasks/rabbitmq_cluster_state.yml +++ b/tasks/rabbitmq_cluster_state.yml @@ -16,8 +16,8 @@ - name: "Gather cluster status" command: "rabbitmqctl cluster_status --formatter json" register: _cluster_status - changed_when: False - failed_when: False + changed_when: false + failed_when: false - name: Define cluster_state fact set_fact: diff --git a/tasks/rabbitmq_feature_flags.yml b/tasks/rabbitmq_feature_flags.yml index eb79c7f9..2f72dca3 100644 --- a/tasks/rabbitmq_feature_flags.yml +++ b/tasks/rabbitmq_feature_flags.yml @@ -16,14 +16,14 @@ - name: "Check for disabled RabbitMQ feature flags" command: "rabbitmqctl list_feature_flags --formatter json name state stability" register: _feature_flags - changed_when: False - failed_when: False + changed_when: false + failed_when: false # NOTE: changed_when required despite the above check because 'unstable' # feature flags will remain disabled each time this runs - name: "Enable missing RabbitMQ feature flags" 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_control: loop_var: flag diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml index e2971a45..c0a193d2 100644 --- a/tasks/rabbitmq_install.yml +++ b/tasks/rabbitmq_install.yml @@ -29,7 +29,7 @@ - name: Reload the systemd daemon systemd: - daemon_reload: yes + daemon_reload: true when: - install_rabbitmq is changed tags: diff --git a/tasks/rabbitmq_pre_install.yml b/tasks/rabbitmq_pre_install.yml index aa72403e..7ff4381c 100644 --- a/tasks/rabbitmq_pre_install.yml +++ b/tasks/rabbitmq_pre_install.yml @@ -47,13 +47,13 @@ lineinfile: dest: /etc/hosts state: present - line: '127.0.0.1 localhost' - regexp: '^127\.0\.0\.1' + line: "127.0.0.1 localhost" + regexp: "^127\\.0\\.0\\.1" - name: Remove hostname record for 127.0.1.1 replace: path: /etc/hosts regexp: '^(127\.0\.1\.1)\s*(\S*)\s*({{ ansible_facts["hostname"] }})($|\s.*)' - replace: '\1 \2 \4' + replace: "\\1 \\2 \\4" when: - rabbitmq_manage_hosts_entries | bool tags: diff --git a/tasks/rabbitmq_upgrade_prep.yml b/tasks/rabbitmq_upgrade_prep.yml index 01f407e4..08712b3d 100644 --- a/tasks/rabbitmq_upgrade_prep.yml +++ b/tasks/rabbitmq_upgrade_prep.yml @@ -18,14 +18,14 @@ src: "policy-rc.d" dest: "/usr/sbin/policy-rc.d" mode: "0755" - backup: yes + backup: true tags: - rabbitmq-policy-file - rabbitmq-upgrade - name: Set node for maintenance state command: rabbitmq-upgrade drain --quiet - changed_when: False + changed_when: false - name: Pause to allow node to sync pause: diff --git a/vars/redhat.yml b/vars/redhat.yml index 4ed6611b..77c8584f 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -29,7 +29,7 @@ _rabbitmq_repo: baseurl: "{{ rabbitmq_repo_url }}" filename: RabbitMQ state: "{{ (rabbitmq_install_method == 'external_repo') | ternary('present', 'absent') }}" - gpgcheck: yes + gpgcheck: true gpgkey: - 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 @@ -42,7 +42,7 @@ _rabbitmq_erlang_repo: baseurl: "{{ rabbitmq_erlang_repo_url }}" filename: els-erlang state: "{{ (rabbitmq_erlang_install_method == 'external_repo') | ternary('present', 'absent') }}" - gpgcheck: yes + gpgcheck: true gpgkey: - 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