From b64f60c6ea69dfde6fdf477ba825cc323ef0f1d9 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 12 Feb 2025 09:06:59 +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: Ibd9d43c92eecc49663b70ace8a2d1fcf30044f37 --- .gitignore | 1 + defaults/main.yml | 22 ++++++++++------------ handlers/main.yml | 4 ++-- tasks/glance_db_sync.yml | 4 ++-- tasks/glance_post_install.yml | 6 +++--- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3a772066..fe6585aa 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ logs/* .tox *.egg-info .eggs +.ansible # Generated by pbr while building docs ###################################### diff --git a/defaults/main.yml b/defaults/main.yml index 1174dc89..9e22da57 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ # limitations under the License. ## Verbosity Options -debug: False +debug: false # Set installation method glance_install_method: "{{ service_install_method | default('source') }}" @@ -56,8 +56,8 @@ glance_etc_dir: "/etc/glance" # Enable/Disable Ceilometer glance_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" -glance_profiler_enabled: False -glance_fatal_deprecations: False +glance_profiler_enabled: false +glance_fatal_deprecations: false ## System info glance_system_user_name: glance @@ -102,12 +102,12 @@ glance_show_multiple_locations: "{{ 'rbd' in glance_available_store_types or 'ci glance_memcached_servers: "{{ memcached_servers }}" ## API options -glance_enable_v2_api: True +glance_enable_v2_api: true ## Oslo Messaging Info # RPC -glance_oslomsg_rpc_configure: False +glance_oslomsg_rpc_configure: false glance_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" glance_oslomsg_rpc_setup_host: "{{ (glance_oslomsg_rpc_host_group in groups) | ternary(groups[glance_oslomsg_rpc_host_group][0], 'localhost') }}" glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" @@ -203,7 +203,7 @@ glance_service_adminurl: "{{ glance_service_adminuri }}" ## Enable automatic parsing of X-Forwarded-Proto, etc. headers passed by the ## load balancer. -glance_proxy_headers_parsing: True +glance_proxy_headers_parsing: true ## Swift Options glance_swift_store_auth_address: "{{ keystone_service_internalurl }}" @@ -240,14 +240,13 @@ glance_api_threads: >- glance_task_executor: taskflow glance_digest_algorithm: sha256 -glance_http_keepalive: True +glance_http_keepalive: true ## Glance policy glance_policy_file: policy.yaml glance_policy_default_rule: default glance_policy_dirs: policy.d - # Define nfs information to enable nfs shares as mounted directories for # glance. The ``glance_remote_client`` value is a list of dictionaries that must # be filled out completely to enable the persistent remote FS mounts (like NFS). @@ -273,7 +272,7 @@ glance_remote_client: "{{ glance_nfs_client | default([]) }}" ## Ceph rbd Options glance_ceph_client: glance glance_rbd_store_pool: images -glance_rbd_store_user: '{{ glance_ceph_client }}' +glance_rbd_store_user: "{{ glance_ceph_client }}" glance_rbd_store_chunk_size: 8 glance_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}" @@ -299,12 +298,11 @@ glance_pip_packages: # Specific pip packages provided by the user glance_user_pip_packages: [] - glance_api_init_overrides: {} # With enabled uwsgi glance has broken functionality of # the interoperable import feature (and maybe smth else) -glance_use_uwsgi: True +glance_use_uwsgi: true ## Service Names glance_services: @@ -364,7 +362,7 @@ glance_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}" glance_pki_keys_path: "{{ glance_pki_dir ~ '/certs/private/' }}" glance_pki_certs_path: "{{ glance_pki_dir ~ '/certs/certs/' }}" glance_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -glance_pki_regen_cert: '' +glance_pki_regen_cert: "" glance_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" glance_pki_certificates: - name: "glance_{{ ansible_facts['hostname'] }}" diff --git a/handlers/main.yml b/handlers/main.yml index 59a4d343..b83baab2 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_glance_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_glance_services }}" diff --git a/tasks/glance_db_sync.yml b/tasks/glance_db_sync.yml index d9a66e91..d38351bc 100644 --- a/tasks/glance_db_sync.yml +++ b/tasks/glance_db_sync.yml @@ -15,12 +15,12 @@ - name: Perform a Glance DB sync command: "{{ glance_bin }}/glance-manage db_sync" - become: yes + become: true become_user: "{{ glance_system_user_name }}" changed_when: false - name: Load glance metadata definitions command: "{{ glance_bin }}/glance-manage db_load_metadefs {{ glance_etc_dir }}/metadefs" - become: yes + become: true become_user: "{{ glance_system_user_name }}" changed_when: false diff --git a/tasks/glance_post_install.yml b/tasks/glance_post_install.yml index 00eea551..589fe626 100644 --- a/tasks/glance_post_install.yml +++ b/tasks/glance_post_install.yml @@ -117,10 +117,10 @@ fetch: src: "{{ item.target_f }}" dest: "{{ item.tmp_f }}" - flat: yes + flat: true changed_when: false run_once: true - check_mode: no + check_mode: false with_items: "{{ glance_core_files }}" - name: Copy common config @@ -206,7 +206,7 @@ mode: "0440" owner: "root" group: "root" - validate: '/usr/sbin/visudo -cf %s' + validate: "/usr/sbin/visudo -cf %s" tags: - sudoers - glance-sudoers