From 983aa07e873a7446294c730eb987a177290994f5 Mon Sep 17 00:00:00 2001 From: dangel101 Date: Thu, 29 Sep 2022 14:36:18 +0300 Subject: [PATCH] fix ansible lint: template-instead-of-copy: 'Templated files should use template instead of copy' --- .../project/roles/ovirt-host-deploy-iptables/tasks/main.yml | 2 +- .../roles/ovirt-host-deploy-ovn-certificates/tasks/main.yml | 4 ++-- .../roles/ovirt-host-deploy-spice-encryption/tasks/main.yml | 2 +- .../ovirt-host-deploy-vdsm-certificates/tasks/main.yml | 6 +++--- .../project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml | 4 ++-- .../tasks/main.yml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-iptables/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-iptables/tasks/main.yml index 6d30cfcca57..bf732623eda 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-iptables/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-iptables/tasks/main.yml @@ -10,7 +10,7 @@ state: present - name: Store iptables - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ host_deploy_iptables_rules }}" dest: "{{ redhat_iptables }}" owner: 'root' diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-ovn-certificates/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-ovn-certificates/tasks/main.yml index c6b8a9596ac..817a612cd3b 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-ovn-certificates/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-ovn-certificates/tasks/main.yml @@ -20,7 +20,7 @@ register: csr - name: Copy OVN CSR - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ csr.stdout }}" dest: "{{ ovirt_pki_dir }}/requests/{{ ovirt_vds_hostname }}-ovn.req" mode: 0644 @@ -45,7 +45,7 @@ mode: 0755 - name: Add OVN cacert file - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ ovirt_ca_cert }}" dest: "{{ ovirt_vdsm_trust_store }}/{{ ovirt_ovn_ca_file }}" owner: 'openvswitch' diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-spice-encryption/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-spice-encryption/tasks/main.yml index ed33854ad81..8e98acb880d 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-spice-encryption/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-spice-encryption/tasks/main.yml @@ -8,7 +8,7 @@ group: root - name: Put cipher string to SPICE config file - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy dest: '/etc/pki/tls/spice.cnf' backup: true mode: 0644 diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm-certificates/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm-certificates/tasks/main.yml index 0db12a524bd..06e883a51de 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm-certificates/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm-certificates/tasks/main.yml @@ -28,7 +28,7 @@ register: csrs - name: Copy vdsm and QEMU CSRs - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ item.stdout }}" dest: "{{ ovirt_pki_dir }}/{{ item.item.item.req_dir }}/{{ ovirt_vds_hostname }}.req" mode: 0644 @@ -77,7 +77,7 @@ loop_var: filedest - name: Add vdsm cacert files - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ ovirt_ca_cert }}" dest: "{{ filedest }}" owner: 'root' @@ -91,7 +91,7 @@ loop_var: filedest - name: Add QEMU cacert file - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ ovirt_qemu_ca_cert }}" dest: "{{ ovirt_vdsm_trust_store }}/{{ ovirt_qemu_ca_file }}" owner: 'root' diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml index b722b614641..f17488083b8 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml @@ -65,7 +65,7 @@ when: not vdsm_id - name: Store vdsm id - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ vdsm_id }}" dest: "{{ vdsm_id_file }}" owner: root @@ -93,7 +93,7 @@ vdsm_config_prefix: "{{ vdsm_config_prefix }} \n[addresses]\nmanagement_port= {{ host_deploy_vdsm_port }} \n" - name: Copy vdsm config prefix to vdsm.conf - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ vdsm_config_prefix }}" dest: "{{ vdsm_config_file }}" owner: root diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vm-console-certificates/tasks/main.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vm-console-certificates/tasks/main.yml index c972d2940bb..e732ae347a6 100644 --- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vm-console-certificates/tasks/main.yml +++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vm-console-certificates/tasks/main.yml @@ -25,7 +25,7 @@ register: csr - name: Copy vmconsole CSR - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ csr.stdout }}" dest: "{{ ovirt_pki_dir }}/requests/{{ ovirt_vds_hostname }}-ssh.req" mode: 0644 @@ -51,7 +51,7 @@ delegate_to: localhost - name: Add vmconsole cacert files - ansible.builtin.copy: + ansible.builtin.copy: # noqa template-instead-of-copy content: "{{ ovirt_ca_key }}" dest: "{{ ovirt_vmconsole_ca_file }}" mode: 0644