From 014a97fe88b35fb227a9e5a01e55420022edf3c1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 11 Feb 2025 19:05:15 +0100 Subject: [PATCH] Auto-fix yaml[truthy] 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. Change-Id: I7f7dfc3aec4578777e1c886504f5b7e589f17c26 --- defaults/main.yml | 12 ++++++------ handlers/main.yml | 6 +++--- tasks/cinder_db_post_setup.yml | 8 +++----- tasks/cinder_db_sync.yml | 2 +- tasks/cinder_install_source.yml | 4 ++-- tasks/cinder_post_install.yml | 2 +- tasks/main.yml | 6 +++--- 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index eae35017..ce29444e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,7 +53,7 @@ cinder_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups # Time period for which to generate volume usages. The options are hour, day, # month, or year. (string value) cinder_volume_usage_audit: hour -cinder_volume_usage_audit_send_actions_enabled: True +cinder_volume_usage_audit_send_actions_enabled: true cinder_storage_availability_zone: nova cinder_default_availability_zone: "{{ cinder_storage_availability_zone }}" @@ -65,7 +65,7 @@ cinder_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0 cinder_nova_catalog_info: compute:nova:internalURL cinder_nova_catalog_admin_info: compute:nova:adminURL -cinder_fatal_deprecations: False +cinder_fatal_deprecations: false ## Database info cinder_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" @@ -287,7 +287,7 @@ cinder_quota_backup_gigabytes: 1000 # - lvm_high_iops # - lvm_low_iops -cinder_manage_volume_types: True +cinder_manage_volume_types: true # Override generated device filter in lvm.conf # Example: @@ -383,7 +383,7 @@ cinder_services: service_name: cinder-api init_config_overrides: "{{ cinder_api_init_overrides }}" start_order: 4 - wsgi_app: True + wsgi_app: true wsgi_name: cinder-wsgi uwsgi_overrides: "{{ cinder_api_uwsgi_ini_overrides }}" uwsgi_port: "{{ cinder_service_port }}" @@ -447,7 +447,7 @@ cinder_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}" cinder_pki_keys_path: "{{ cinder_pki_dir ~ '/certs/private/' }}" cinder_pki_certs_path: "{{ cinder_pki_dir ~ '/certs/certs/' }}" cinder_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -cinder_pki_regen_cert: '' +cinder_pki_regen_cert: "" cinder_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" cinder_pki_certificates: - name: "cinder_{{ ansible_facts['hostname'] }}" @@ -479,7 +479,7 @@ cinder_pki_install_certificates: # Database cleanup # Periodically purge shadow tables, where archived records are stored -cinder_purge_deleted: False +cinder_purge_deleted: false # When to start purge task. cinder_purge_deleted_on_calendar: "*-*-* 01:00:00" # Purge events that are older then the number of days below. diff --git a/handlers/main.yml b/handlers/main.yml index 8f7e87d4..d225debf 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -16,7 +16,7 @@ - name: Stop services service: name: "{{ item.service_name }}" - enabled: yes + enabled: true state: stopped daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" with_items: "{{ filtered_cinder_services }}" @@ -33,7 +33,7 @@ - name: Start services service: name: "{{ item.service_name }}" - enabled: yes + enabled: true state: "started" daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" with_items: "{{ filtered_cinder_services }}" @@ -50,6 +50,6 @@ - name: Ensure tgt service restarted service: name: "{{ tgt_service_name }}" - enabled: yes + enabled: true state: restarted daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" diff --git a/tasks/cinder_db_post_setup.yml b/tasks/cinder_db_post_setup.yml index 0795dbe3..bd8e10ad 100644 --- a/tasks/cinder_db_post_setup.yml +++ b/tasks/cinder_db_post_setup.yml @@ -15,7 +15,6 @@ - name: Perform data migrations if necessary and all cinder services are up block: - - name: Perform online data migrations command: "{{ cinder_bin }}/cinder-manage db online_data_migrations" register: data_migrations @@ -25,12 +24,11 @@ until: "data_migrations.rc in [0, 2]" rescue: - - name: Check if all cinder services are up shell: "{{ cinder_bin }}/cinder-manage service list | /usr/bin/awk '{ if(NR>1) print $5 }' | /bin/egrep -vq ':-)'" register: failed_cinder_services changed_when: false - ignore_errors: True + ignore_errors: true - name: Fail if any cinder service is down fail: @@ -42,7 +40,7 @@ msg: An unexpected error occured. when: failed_cinder_services.rc == 1 - become: yes + become: true become_user: "{{ cinder_system_user_name }}" when: - "ansible_local['openstack_ansible']['cinder']['need_online_data_migrations'] | bool" @@ -53,7 +51,7 @@ dest: "/etc/ansible/facts.d/openstack_ansible.fact" section: cinder option: need_online_data_migrations - value: False + value: false mode: "0644" with_items: "{{ groups[cinder_services['cinder-api']['group']] }}" when: diff --git a/tasks/cinder_db_sync.yml b/tasks/cinder_db_sync.yml index 0ff6c669..b8a189c8 100644 --- a/tasks/cinder_db_sync.yml +++ b/tasks/cinder_db_sync.yml @@ -15,6 +15,6 @@ - name: Perform a cinder DB sync command: "{{ cinder_bin }}/cinder-manage db sync" - become: yes + become: true become_user: "{{ cinder_system_user_name }}" changed_when: false diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml index a0cf94a8..fc5dade0 100644 --- a/tasks/cinder_install_source.yml +++ b/tasks/cinder_install_source.yml @@ -26,10 +26,10 @@ venv_facts_when_changed: - section: "cinder" option: "need_service_restart" - value: True + value: true - section: "cinder" option: "need_online_data_migrations" - value: True + value: true - section: "cinder" option: "venv_tag" value: "{{ cinder_venv_tag }}" diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml index ee9ec0cc..97a0f40d 100644 --- a/tasks/cinder_post_install.yml +++ b/tasks/cinder_post_install.yml @@ -98,7 +98,7 @@ fetch: src: "{{ item.target_f }}.original" dest: "{{ item.tmp_f }}" - flat: yes + flat: true changed_when: false with_items: "{{ cinder_core_files }}" run_once: true diff --git a/tasks/main.yml b/tasks/main.yml index 7986c85c..ce820059 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -289,10 +289,10 @@ execstarts: - "{{ cinder_bin }}/cinder-manage db purge {{ cinder_purge_deleted_before_days }}" environment: - UMASK: '0640' - UMASK_DIR: '0750' + UMASK: "0640" + UMASK_DIR: "0750" program_sandboxing: - RuntimeDirectory: 'cinder-purge-deleted' + RuntimeDirectory: "cinder-purge-deleted" enabled: "{{ cinder_purge_deleted }}" timer: state: "{{ cinder_purge_deleted | ternary('started', 'stopped') }}"