From 8bd3b50e31fc6593bbe19922b5f06cb6b13f96ad Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Tue, 28 Jul 2020 10:21:08 +0200 Subject: [PATCH] Fix ansible-lint E404 (#6417) --- roles/container-engine/containerd/tasks/crictl.yml | 4 ++-- roles/container-engine/cri-o/tasks/crictl.yml | 4 ++-- roles/network_plugin/contiv/tasks/pre-reset.yml | 8 ++++---- tests/cloud_playbooks/create-aws.yml | 4 ++-- tests/cloud_playbooks/create-do.yml | 4 ++-- tests/cloud_playbooks/create-gce.yml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/container-engine/containerd/tasks/crictl.yml b/roles/container-engine/containerd/tasks/crictl.yml index 9310cb945..848095166 100644 --- a/roles/container-engine/containerd/tasks/crictl.yml +++ b/roles/container-engine/containerd/tasks/crictl.yml @@ -4,9 +4,9 @@ vars: download: "{{ download_defaults | combine(downloads.crictl) }}" -- name: Install crictl config # noqa 404 +- name: Install crictl config template: - src: ../templates/crictl.yaml.j2 + src: ../templates/crictl.yaml.j2 # noqa 404 not in role_path when task is included from download role dest: /etc/crictl.yaml owner: bin mode: 0644 diff --git a/roles/container-engine/cri-o/tasks/crictl.yml b/roles/container-engine/cri-o/tasks/crictl.yml index 146fef66a..1639c4971 100644 --- a/roles/container-engine/cri-o/tasks/crictl.yml +++ b/roles/container-engine/cri-o/tasks/crictl.yml @@ -4,9 +4,9 @@ vars: download: "{{ download_defaults | combine(downloads.crictl) }}" -- name: Install crictl config # noqa 404 +- name: Install crictl config template: - src: ../templates/crictl.yaml.j2 + src: ../templates/crictl.yaml.j2 # noqa 404 not in role_path when task is included from download role dest: /etc/crictl.yaml owner: bin mode: 0644 diff --git a/roles/network_plugin/contiv/tasks/pre-reset.yml b/roles/network_plugin/contiv/tasks/pre-reset.yml index f7e66f01f..19f6a9798 100644 --- a/roles/network_plugin/contiv/tasks/pre-reset.yml +++ b/roles/network_plugin/contiv/tasks/pre-reset.yml @@ -21,9 +21,9 @@ - contiv_kubectl.stat.exists - inventory_hostname == groups['kube-master'][0] -- name: reset | Copy contiv temporary cleanup script # noqa 404 +- name: reset | Copy contiv temporary cleanup script copy: - src: ../files/contiv-cleanup.sh # Not in role_path so we must trick... + src: ../files/contiv-cleanup.sh # noqa 404 Not in role_path so we must trick... dest: /opt/cni/bin/cleanup owner: root group: root @@ -31,9 +31,9 @@ when: - contiv_kubectl.stat.exists -- name: reset | Lay down contiv cleanup template # noqa 404 +- name: reset | Lay down contiv cleanup template template: - src: ../templates/contiv-cleanup.yml.j2 # Not in role_path so we must trick... + src: ../templates/contiv-cleanup.yml.j2 # noqa 404 Not in role_path so we must trick... dest: "{{ kube_config_dir }}/contiv-cleanup.yml" # kube_config_dir is used here as contiv_config_dir is not necessarily set at reset register: contiv_cleanup_manifest when: diff --git a/tests/cloud_playbooks/create-aws.yml b/tests/cloud_playbooks/create-aws.yml index 52317e794..a1982edfa 100644 --- a/tests/cloud_playbooks/create-aws.yml +++ b/tests/cloud_playbooks/create-aws.yml @@ -18,7 +18,7 @@ instance_tags: "{{ aws.tags }}" register: ec2 - - name: Template the inventory # noqa 404 + - name: Template the inventory template: - src: ../templates/inventory-aws.j2 + src: ../templates/inventory-aws.j2 # noqa 404 CI inventory templates are not in role_path dest: "{{ inventory_path }}" diff --git a/tests/cloud_playbooks/create-do.yml b/tests/cloud_playbooks/create-do.yml index 5d41f714d..4fa4c33ca 100644 --- a/tests/cloud_playbooks/create-do.yml +++ b/tests/cloud_playbooks/create-do.yml @@ -86,8 +86,8 @@ msg: "{{ droplets }}, {{ inventory_path }}" when: state == 'present' - - name: Template the inventory # noqa 404 + - name: Template the inventory template: - src: ../templates/inventory-do.j2 + src: ../templates/inventory-do.j2 # noqa 404 CI templates are not in role_path dest: "{{ inventory_path }}" when: state == 'present' diff --git a/tests/cloud_playbooks/create-gce.yml b/tests/cloud_playbooks/create-gce.yml index 57e5d1d41..f9f474f83 100644 --- a/tests/cloud_playbooks/create-gce.yml +++ b/tests/cloud_playbooks/create-gce.yml @@ -49,7 +49,7 @@ add_host: hostname={{ item.public_ip }} groupname="waitfor_hosts" with_items: '{{ gce.instance_data }}' - - name: Template the inventory # noqa 404 + - name: Template the inventory # noqa 404 CI inventory templates are not in role_path template: src: ../templates/inventory-gce.j2 dest: "{{ inventory_path }}" @@ -60,7 +60,7 @@ state: directory when: mode in ['scale', 'separate-scale', 'ha-scale'] - - name: Template fake hosts group vars # noqa 404 + - name: Template fake hosts group vars # noqa 404 CI templates are not in role_path template: src: ../templates/fake_hosts.yml.j2 dest: "{{ inventory_path|dirname }}/group_vars/fake_hosts.yml"