From 605244681195199a426bcae8b1506fa007eca42d Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 17 Feb 2025 12:28:50 +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: Idc1c7bdd802c3c199120110b665d977ad2883918 --- .gitignore | 1 + defaults/main.yml | 11 +++++------ examples/playbook.yml | 2 +- handlers/main.yml | 2 +- tasks/main.yml | 2 +- tasks/zookeeper_install.yml | 2 +- tasks/zookeeper_post_install.yml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3a77206..c46a9ec 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 c59b720..b1ccdf4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,8 +32,8 @@ zookeeper_cluster_address_hostvars_key: "ansible_host" # Ports and TLS zookeeper_client_port: 2181 zookeeper_secure_client_port: 2281 -zookeeper_ssl_client_enable: True -zookeeper_ssl_quorum_enable: True +zookeeper_ssl_client_enable: true +zookeeper_ssl_quorum_enable: true zookeeper_ssl_protocols: - TLSv1.2 - TLSv1.3 @@ -46,7 +46,7 @@ zookeeper_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }} # Create a certificate authority if one does not already exist zookeeper_pki_create_ca: "{{ openstack_pki_authorities is not defined | bool }}" -zookeeper_pki_regen_ca: '' +zookeeper_pki_regen_ca: "" zookeeper_pki_authorities: - name: "ZookeeperRoot" country: "GB" @@ -87,7 +87,7 @@ zookeeper_pki_certs_path: "{{ zookeeper_pki_dir ~ '/certs/certs/' }}" zookeeper_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ZookeeperIntermediate') }}" zookeeper_pki_intermediate_cert_path: >- {{ zookeeper_pki_dir ~ '/roots/' ~ zookeeper_pki_intermediate_cert_name ~ '/certs/' ~ zookeeper_pki_intermediate_cert_name ~ '.crt' }} -zookeeper_pki_regen_cert: '' +zookeeper_pki_regen_cert: "" zookeeper_pki_certificates: - name: "zookeeper_{{ ansible_facts['hostname'] }}" provider: ownca @@ -139,7 +139,6 @@ zookeeper_data_dir: "{{ zookeeper_system_user_home }}" zookeeper_data_log_dir: "{{ zookeeper_data_dir }}/log" zookeeper_file_myid_dest: "{{ zookeeper_data_dir }}/myid" - # Set the package install state for distribution packages zookeeper_package_requirements: "{{ _zookeeper_package_requirements }}" zookeeper_package_state: "{{ package_state | default('latest') }}" @@ -164,5 +163,5 @@ zookeeper_commands_whitelist: - isro - envi -zookeeper_prometheus_enable: False +zookeeper_prometheus_enable: false zookeeper_prometheus_port: 7000 diff --git a/examples/playbook.yml b/examples/playbook.yml index d04e5bb..9555dee 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -1,7 +1,7 @@ --- - name: Install zookeeper cluster hosts: zookeeper_all - become: yes + become: true vars: management_address: "{{ ansible_host }}" roles: diff --git a/handlers/main.yml b/handlers/main.yml index 2a0ae84..d8c837b 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -41,7 +41,7 @@ - name: Start zookeeper service: name: "{{ zookeeper_service['name'] }}" - enabled: True + enabled: true state: "started" listen: - Restart zookeeper diff --git a/tasks/main.yml b/tasks/main.yml index e9f32d9..5b819b0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -75,7 +75,7 @@ systemd_service_tasks_accounting: true systemd_services: - service_name: "{{ zookeeper_service['name'] }}" - enabled: yes + enabled: true restart_changed: false execstarts: "{{ zookeeper_service['execstarts'] }}" execstops: "{{ zookeeper_service['execstops'] }}" diff --git a/tasks/zookeeper_install.yml b/tasks/zookeeper_install.yml index 8df26d4..c7255e7 100644 --- a/tasks/zookeeper_install.yml +++ b/tasks/zookeeper_install.yml @@ -35,7 +35,7 @@ unarchive: dest: "/opt/zookeeper-{{ zookeeper_download_version }}" src: "/opt/{{ zookeeper_download_url | basename }}" - remote_src: yes + remote_src: true owner: "{{ zookeeper_system_user_name }}" group: "{{ zookeeper_system_group_name }}" extra_opts: diff --git a/tasks/zookeeper_post_install.yml b/tasks/zookeeper_post_install.yml index 31c6e8f..f1bd8cb 100644 --- a/tasks/zookeeper_post_install.yml +++ b/tasks/zookeeper_post_install.yml @@ -17,7 +17,7 @@ copy: src: "{{ item }}" dest: "{{ zookeeper_config_dir }}/{{ item | basename }}" - remote_src: yes + remote_src: true mode: "0644" with_items: - "/opt/zookeeper-{{ zookeeper_download_version }}/conf/configuration.xsl"