diff --git a/changelogs/fragments/543-fix-ansible-lint-for_disaster_recovery-and-remove_stale_lun.yml b/changelogs/fragments/543-fix-ansible-lint-for_disaster_recovery-and-remove_stale_lun.yml new file mode 100644 index 000000000..971ecbf0d --- /dev/null +++ b/changelogs/fragments/543-fix-ansible-lint-for_disaster_recovery-and-remove_stale_lun.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Fix "ansible-lint" version 6.0.0 for "disaster_recovery" and "remove_stale_lun" roles (https://github.com/oVirt/ovirt-ansible-collection/pull/543). diff --git a/roles/disaster_recovery/examples/disaster_recovery_vars.yml b/roles/disaster_recovery/examples/disaster_recovery_vars.yml index 7b41b66b2..0c50409cc 100644 --- a/roles/disaster_recovery/examples/disaster_recovery_vars.yml +++ b/roles/disaster_recovery/examples/disaster_recovery_vars.yml @@ -21,8 +21,8 @@ dr_import_storages: dr_secondary_name: "secondary_master_storage" - dr_domain_type: "nfs" - dr_wipe_after_delete: False - dr_backup: False + dr_wipe_after_delete: false + dr_backup: false dr_critical_space_action_blocker: 5 dr_warning_low_space: 5 dr_primary_master_domain: "False" @@ -31,14 +31,14 @@ dr_import_storages: dr_primary_path: "/export/path2" dr_primary_dc_name: "Prod" dr_secondary_name: "path2" - dr_secondary_master_domain: False + dr_secondary_master_domain: false dr_secondary_address: "yy.yy.yy.yy" dr_secondary_path: "/export/path2" dr_secondary_dc_name: "Recovery" - dr_domain_type: "iscsi" - dr_wipe_after_delete: False - dr_backup: False + dr_wipe_after_delete: false + dr_backup: false dr_critical_space_action_blocker: 1 dr_warning_low_space: 5 dr_primary_master_domain: "False" diff --git a/roles/disaster_recovery/tasks/clean/shutdown_vm.yml b/roles/disaster_recovery/tasks/clean/shutdown_vm.yml index e61b22d51..b076776cd 100644 --- a/roles/disaster_recovery/tasks/clean/shutdown_vm.yml +++ b/roles/disaster_recovery/tasks/clean/shutdown_vm.yml @@ -3,8 +3,8 @@ ovirt_vm: state: stopped name: "{{ vms.name }}" - force: True - wait: True + force: true + wait: true auth: "{{ ovirt_auth }}" ignore_errors: "{{ dr_ignore_error_clean }}" tags: diff --git a/roles/disaster_recovery/tasks/recover/register_templates.yml b/roles/disaster_recovery/tasks/recover/register_templates.yml index c1b481026..ef9fde286 100644 --- a/roles/disaster_recovery/tasks/recover/register_templates.yml +++ b/roles/disaster_recovery/tasks/recover/register_templates.yml @@ -2,7 +2,7 @@ - name: Fetch unregistered Templates from storage domain ovirt_storage_template_info: nested_attributes: "id" - unregistered: True + unregistered: true storage_domain: "{{ storage.name }}" auth: "{{ ovirt_auth }}" register: storage_template_info diff --git a/roles/disaster_recovery/tasks/recover/register_vms.yml b/roles/disaster_recovery/tasks/recover/register_vms.yml index 15dc763fb..23951237b 100644 --- a/roles/disaster_recovery/tasks/recover/register_vms.yml +++ b/roles/disaster_recovery/tasks/recover/register_vms.yml @@ -2,7 +2,7 @@ - name: Fetch unregistered VMs from storage domain ovirt_storage_vm_info: nested_attributes: "id" - unregistered: True + unregistered: true storage_domain: "{{ storage.name }}" auth: "{{ ovirt_auth }}" register: storage_vm_info diff --git a/roles/disaster_recovery/tasks/recover/run_vms.yml b/roles/disaster_recovery/tasks/recover/run_vms.yml index cdf06ef35..766d7c615 100644 --- a/roles/disaster_recovery/tasks/recover/run_vms.yml +++ b/roles/disaster_recovery/tasks/recover/run_vms.yml @@ -3,7 +3,7 @@ ovirt_vm: state: running name: "{{ vms.name }}" - wait: False + wait: false auth: "{{ ovirt_auth }}" register: result - name: Log append succeed_to_run_vms diff --git a/roles/disaster_recovery/tasks/recover_engine.yml b/roles/disaster_recovery/tasks/recover_engine.yml index c5112186a..851cde040 100644 --- a/roles/disaster_recovery/tasks/recover_engine.yml +++ b/roles/disaster_recovery/tasks/recover_engine.yml @@ -5,13 +5,13 @@ username: "{{ vars['dr_sites_' + dr_target_host + '_username'] }}" password: "{{ vars['dr_sites_' + dr_target_host + '_password'] }}" ca_file: "{{ vars['dr_sites_' + dr_target_host + '_ca_file'] }}" - ignore_errors: False + ignore_errors: false - name: Delete previous report log file: path: "/tmp/{{ dr_report_file }}" state: absent - ignore_errors: True + ignore_errors: true - name: Create report file file: diff --git a/roles/disaster_recovery/tasks/unregister_entities.yml b/roles/disaster_recovery/tasks/unregister_entities.yml index 2c1d7f64a..b664633e6 100644 --- a/roles/disaster_recovery/tasks/unregister_entities.yml +++ b/roles/disaster_recovery/tasks/unregister_entities.yml @@ -21,7 +21,7 @@ - name: Fetch all data of running VMs from file, if exists. set_fact: running_vms_fail_back="{{ lookup('file', dr_running_vms) }}" when: stat_result.stat.exists - ignore_errors: True + ignore_errors: true - name: Init list property for running_vms set_fact: