Skip to content

Commit

Permalink
Merge pull request #1404 from jongwooo/ansible-actions-use-fully-qual…
Browse files Browse the repository at this point in the history
…ified-collection-names

Ansible actions use fully-qualified collection names
  • Loading branch information
k8s-ci-robot authored Feb 26, 2024
2 parents c18bbcd + 8098244 commit 04a3618
Show file tree
Hide file tree
Showing 90 changed files with 538 additions and 653 deletions.
124 changes: 9 additions & 115 deletions images/capi/.ansible-lint-ignore
Original file line number Diff line number Diff line change
@@ -1,236 +1,130 @@
# This file contains ignores rule violations for ansible-lint
ansible/firstboot.yml fqcn[action-core]
ansible/firstboot.yml name[missing]
ansible/firstboot.yml name[play]
ansible/node.yml fqcn[action-core]
ansible/node.yml name[missing]
ansible/node.yml name[play]
ansible/python.yml fqcn[action-core]
ansible/python.yml name[missing]
ansible/python.yml name[play]
ansible/roles/containerd/tasks/debian.yml fqcn[action-core]
ansible/roles/containerd/tasks/main.yml fqcn[action-core]
ansible/roles/containerd/tasks/main.yml name[missing]
ansible/roles/containerd/tasks/main.yml risky-file-permissions
ansible/roles/containerd/tasks/photon.yml fqcn[action-core]
ansible/roles/containerd/tasks/photon.yml no-changed-when
ansible/roles/containerd/tasks/redhat.yml fqcn[action-core]
ansible/roles/firstboot/tasks/main.yaml fqcn[action-core]
ansible/roles/firstboot/tasks/main.yaml name[missing]
ansible/roles/firstboot/tasks/photon.yml fqcn[action-core]
ansible/roles/firstboot/tasks/qemu.yml fqcn[action-core]
ansible/roles/firstboot/tasks/qemu.yml name[missing]
ansible/roles/gpu/tasks/amd.yml no-changed-when
ansible/roles/gpu/tasks/main.yml ignore-errors
ansible/roles/gpu/tasks/nvidia.yml no-changed-when
ansible/roles/kubernetes/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/kubernetes/defaults/main.yml yaml[line-length]
ansible/roles/kubernetes/tasks/crictl-url.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/crictl-url.yml name[template]
ansible/roles/kubernetes/tasks/debian.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/debian.yml jinja[spacing]
ansible/roles/kubernetes/tasks/ecrpull.yml command-instead-of-shell
ansible/roles/kubernetes/tasks/ecrpull.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/ecrpull.yml no-changed-when
ansible/roles/kubernetes/tasks/kubeadmpull.yml command-instead-of-shell
ansible/roles/kubernetes/tasks/kubeadmpull.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/kubeadmpull.yml no-changed-when
ansible/roles/kubernetes/tasks/main.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/main.yml name[missing]
ansible/roles/kubernetes/tasks/mariner.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/mariner.yml jinja[spacing]
ansible/roles/kubernetes/tasks/mariner.yml no-changed-when
ansible/roles/kubernetes/tasks/photon.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/photon.yml jinja[spacing]
ansible/roles/kubernetes/tasks/photon.yml no-changed-when
ansible/roles/kubernetes/tasks/redhat.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/redhat.yml jinja[spacing]
ansible/roles/kubernetes/tasks/url.yml command-instead-of-shell
ansible/roles/kubernetes/tasks/url.yml fqcn[action-core]
ansible/roles/kubernetes/tasks/url.yml no-changed-when
ansible/roles/load_additional_components/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/load_additional_components/tasks/executables.yml fqcn[action-core]
ansible/roles/load_additional_components/tasks/main.yml fqcn[action-core]
ansible/roles/load_additional_components/tasks/main.yml name[missing]
ansible/roles/load_additional_components/tasks/registry.yml command-instead-of-shell
ansible/roles/load_additional_components/tasks/registry.yml fqcn[action-core]
ansible/roles/load_additional_components/tasks/registry.yml no-changed-when
ansible/roles/load_additional_components/tasks/url.yml command-instead-of-shell
ansible/roles/load_additional_components/tasks/url.yml fqcn[action-core]
ansible/roles/load_additional_components/tasks/url.yml no-changed-when
ansible/roles/load_additional_components/tasks/url.yml risky-file-permissions
ansible/roles/load_additional_components/tasks/url.yml yaml[line-length]
ansible/roles/node/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/node/tasks/amazonLinux2.yml fqcn[action-core]
ansible/roles/node/tasks/main.yml command-instead-of-module
ansible/roles/node/tasks/main.yml fqcn[action-core]
ansible/roles/node/tasks/main.yml fqcn[action]
ansible/roles/node/tasks/main.yml name[missing]
ansible/roles/node/tasks/main.yml no-changed-when
ansible/roles/node/tasks/photon.yml fqcn[action-core]
ansible/roles/node/tasks/photon.yml fqcn[action]
ansible/roles/node/tasks/photon.yml risky-file-permissions
ansible/roles/gpu/tasks/main.yml fqcn[action-core]
ansible/roles/gpu/tasks/main.yml fqcn[action]
ansible/roles/gpu/tasks/main.yml ignore-errors
ansible/roles/gpu/tasks/main.yml no-changed-when
ansible/roles/gpu/tasks/amd.yml fqcn[action-core]
ansible/roles/gpu/tasks/amd.yml fqcn[action]
ansible/roles/gpu/tasks/amd.yml ignore-errors
ansible/roles/gpu/tasks/amd.yml no-changed-when
ansible/roles/gpu/tasks/nvidia.yml fqcn[action-core]
ansible/roles/gpu/tasks/nvidia.yml fqcn[action]
ansible/roles/gpu/tasks/nvidia.yml ignore-errors
ansible/roles/gpu/tasks/nvidia.yml no-changed-when
ansible/roles/providers/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/providers/tasks/aws.yml command-instead-of-shell
ansible/roles/providers/tasks/aws.yml fqcn[action-core]
ansible/roles/providers/tasks/aws.yml name[missing]
ansible/roles/providers/tasks/aws.yml no-changed-when
ansible/roles/providers/tasks/aws.yml package-latest
ansible/roles/providers/tasks/awscliv2.yml fqcn[action-core]
ansible/roles/providers/tasks/awscliv2.yml no-changed-when
ansible/roles/providers/tasks/awscliv2.yml risky-file-permissions
ansible/roles/providers/tasks/azure.yml fqcn[action-core]
ansible/roles/providers/tasks/azure.yml name[missing]
ansible/roles/providers/tasks/azure.yml risky-file-permissions
ansible/roles/providers/tasks/cloudstack.yml command-instead-of-shell
ansible/roles/providers/tasks/cloudstack.yml fqcn[action-core]
ansible/roles/providers/tasks/cloudstack.yml no-changed-when
ansible/roles/providers/tasks/debian.yml fqcn[action-core]
ansible/roles/providers/tasks/debian.yml package-latest
ansible/roles/providers/tasks/googlecompute.yml command-instead-of-shell
ansible/roles/providers/tasks/googlecompute.yml fqcn[action-core]
ansible/roles/providers/tasks/googlecompute.yml no-changed-when
ansible/roles/providers/tasks/hcloud.yml fqcn[action-core]
ansible/roles/providers/tasks/main.yml fqcn[action-core]
ansible/roles/providers/tasks/main.yml name[missing]
ansible/roles/providers/tasks/main.yml risky-file-permissions
ansible/roles/providers/tasks/mariner.yml fqcn[action-core]
ansible/roles/providers/tasks/nutanix-redhat.yml fqcn[action-core]
ansible/roles/providers/tasks/nutanix-redhat.yml fqcn[action]
ansible/roles/providers/tasks/nutanix-redhat.yml risky-file-permissions
ansible/roles/providers/tasks/nutanix-ubuntu.yml fqcn[action-core]
ansible/roles/providers/tasks/nutanix-ubuntu.yml fqcn[action]
ansible/roles/providers/tasks/nutanix-ubuntu.yml risky-file-permissions
ansible/roles/providers/tasks/nutanix.yml fqcn[action-core]
ansible/roles/providers/tasks/nutanix.yml name[missing]
ansible/roles/providers/tasks/nutanix.yml risky-file-permissions
ansible/roles/providers/tasks/oci.yml fqcn[action-core]
ansible/roles/providers/tasks/openstack.yml fqcn[action-core]
ansible/roles/providers/tasks/outscale.yml fqcn[action-core]
ansible/roles/providers/tasks/qemu.yml fqcn[action-core]
ansible/roles/providers/tasks/raw.yml command-instead-of-shell
ansible/roles/providers/tasks/raw.yml fqcn[action-core]
ansible/roles/providers/tasks/raw.yml no-changed-when
ansible/roles/providers/tasks/redhat.yml command-instead-of-module
ansible/roles/providers/tasks/redhat.yml fqcn[action-core]
ansible/roles/providers/tasks/redhat.yml no-changed-when
ansible/roles/providers/tasks/vmware-photon.yml fqcn[action-core]
ansible/roles/providers/tasks/vmware-photon.yml no-changed-when
ansible/roles/providers/tasks/vmware-photon.yml risky-file-permissions
ansible/roles/providers/tasks/vmware-redhat.yml command-instead-of-shell
ansible/roles/providers/tasks/vmware-redhat.yml fqcn[action-core]
ansible/roles/providers/tasks/vmware-redhat.yml no-changed-when
ansible/roles/providers/tasks/vmware-ubuntu.yml fqcn[action-core]
ansible/roles/providers/tasks/vmware-ubuntu.yml risky-file-permissions
ansible/roles/providers/tasks/vmware.yml fqcn[action-core]
ansible/roles/providers/tasks/vmware.yml name[missing]
ansible/roles/python/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/python/tasks/flatcar.yml fqcn[action-core]
ansible/roles/python/tasks/flatcar.yml no-changed-when
ansible/roles/python/tasks/main.yml fqcn[action-core]
ansible/roles/python/tasks/main.yml name[missing]
ansible/roles/python/tasks/main.yml no-changed-when
ansible/roles/setup/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/setup/tasks/bootstrap-flatcar.yml fqcn[action-core]
ansible/roles/setup/tasks/debian.yml command-instead-of-module
ansible/roles/setup/tasks/debian.yml fqcn[action-core]
ansible/roles/setup/tasks/debian.yml no-changed-when
ansible/roles/setup/tasks/debian.yml package-latest
ansible/roles/setup/tasks/flatcar.yml fqcn[action-core]
ansible/roles/setup/tasks/flatcar.yml name[missing]
ansible/roles/setup/tasks/flatcar.yml risky-file-permissions
ansible/roles/setup/tasks/main.yml fqcn[action-core]
ansible/roles/setup/tasks/main.yml name[missing]
ansible/roles/setup/tasks/mariner.yml fqcn[action-core]
ansible/roles/setup/tasks/mariner.yml name[missing]
ansible/roles/setup/tasks/mariner.yml package-latest
ansible/roles/setup/tasks/photon.yml fqcn[action-core]
ansible/roles/setup/tasks/photon.yml fqcn[action]
ansible/roles/setup/tasks/photon.yml name[missing]
ansible/roles/setup/tasks/photon.yml no-changed-when
ansible/roles/setup/tasks/redhat.yml command-instead-of-module
ansible/roles/setup/tasks/redhat.yml fqcn[action-core]
ansible/roles/setup/tasks/redhat.yml fqcn[action]
ansible/roles/setup/tasks/redhat.yml name[missing]
ansible/roles/setup/tasks/redhat.yml no-changed-when
ansible/roles/setup/tasks/redhat.yml package-latest
ansible/roles/setup/tasks/rpm_repos.yml fqcn[action-core]
ansible/roles/setup/tasks/rpm_repos.yml no-changed-when
ansible/roles/sysprep/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/sysprep/tasks/debian.yml fqcn[action-core]
ansible/roles/sysprep/tasks/debian.yml no-changed-when
ansible/roles/sysprep/tasks/debian.yml risky-shell-pipe
ansible/roles/sysprep/tasks/flatcar.yml fqcn[action-core]
ansible/roles/sysprep/tasks/flatcar.yml no-changed-when
ansible/roles/sysprep/tasks/main.yml fqcn[action-core]
ansible/roles/sysprep/tasks/main.yml name[missing]
ansible/roles/sysprep/tasks/main.yml no-changed-when
ansible/roles/sysprep/tasks/main.yml risky-file-permissions
ansible/roles/sysprep/tasks/main.yml risky-shell-pipe
ansible/roles/sysprep/tasks/mariner.yml fqcn[action-core]
ansible/roles/sysprep/tasks/mariner.yml name[missing]
ansible/roles/sysprep/tasks/mariner.yml no-changed-when
ansible/roles/sysprep/tasks/photon.yml fqcn[action-core]
ansible/roles/sysprep/tasks/photon.yml name[missing]
ansible/roles/sysprep/tasks/photon.yml no-changed-when
ansible/roles/sysprep/tasks/photon.yml risky-shell-pipe
ansible/roles/sysprep/tasks/redhat.yml command-instead-of-module
ansible/roles/sysprep/tasks/redhat.yml fqcn[action-core]
ansible/roles/sysprep/tasks/redhat.yml fqcn[action]
ansible/roles/sysprep/tasks/redhat.yml name[missing]
ansible/roles/sysprep/tasks/redhat.yml no-changed-when
ansible/roles/sysprep/tasks/redhat.yml risky-shell-pipe
ansible/roles/sysprep/tasks/rpm_repos.yml fqcn[action-core]
ansible/roles/sysprep/tasks/rpm_repos.yml no-changed-when
ansible/windows/example.vars.yml yaml[line-length]
ansible/windows/node_windows.yml fqcn[action-core]
ansible/windows/node_windows.yml fqcn[action]
ansible/windows/node_windows.yml name[missing]
ansible/windows/node_windows.yml name[play]
ansible/windows/node_windows.yml schema[playbook]
ansible/windows/roles/cloudbase-init/tasks/main.yml fqcn[action]
ansible/windows/roles/cloudbase-init/tasks/main.yml schema[tasks]
ansible/windows/roles/debug/defaults/main.yml var-naming[no-role-prefix]
ansible/windows/roles/debug/tasks/main.yml fqcn[action]
ansible/windows/roles/gmsa/tasks/gmsa_keyvault.yml fqcn[action]
ansible/windows/roles/gmsa/tasks/main.yml fqcn[action-core]
ansible/windows/roles/gmsa/tasks/main.yml name[missing]
ansible/windows/roles/kubernetes/tasks/kubelet.yml fqcn[action-core]
ansible/windows/roles/kubernetes/tasks/kubelet.yml fqcn[action]
ansible/windows/roles/kubernetes/tasks/kubelet.yml name[missing]
ansible/windows/roles/kubernetes/tasks/main.yml fqcn[action-core]
ansible/windows/roles/kubernetes/tasks/main.yml fqcn[action]
ansible/windows/roles/kubernetes/tasks/kubelet.yml yaml[line-length]
ansible/windows/roles/kubernetes/tasks/main.yml name[missing]
ansible/windows/roles/kubernetes/tasks/nssm.yml fqcn[action]
ansible/windows/roles/kubernetes/tasks/sc.yml fqcn[action-core]
ansible/windows/roles/kubernetes/tasks/sc.yml fqcn[action]
ansible/windows/roles/kubernetes/tasks/sc.yml yaml[line-length]
ansible/windows/roles/kubernetes/tasks/url.yml fqcn[action]
ansible/windows/roles/load_additional_components/defaults/main.yml var-naming[no-role-prefix]
ansible/windows/roles/load_additional_components/tasks/executables.yml fqcn[action]
ansible/windows/roles/load_additional_components/tasks/main.yml fqcn[action-core]
ansible/windows/roles/load_additional_components/tasks/main.yml name[missing]
ansible/windows/roles/load_additional_components/tasks/registry.yml fqcn[action]
ansible/windows/roles/load_additional_components/tasks/url.yml fqcn[action]
ansible/windows/roles/providers/defaults/main.yml var-naming[no-role-prefix]
ansible/windows/roles/providers/tasks/azure.yml fqcn[action]
ansible/windows/roles/providers/tasks/azure.yml schema[tasks]
ansible/windows/roles/providers/tasks/azure.yml yaml[line-length]
ansible/windows/roles/providers/tasks/main.yml fqcn[action-core]
ansible/windows/roles/providers/tasks/main.yml name[missing]
ansible/windows/roles/runtimes/defaults/main.yml var-naming[no-role-prefix]
ansible/windows/roles/runtimes/tasks/containerd.yml fqcn[action]
ansible/windows/roles/runtimes/tasks/main.yml fqcn[action-core]
ansible/windows/roles/runtimes/tasks/main.yml name[missing]
ansible/windows/roles/systemprep/defaults/main.yml var-naming[no-role-prefix]
ansible/windows/roles/systemprep/tasks/main.yml fqcn[action-core]
ansible/windows/roles/systemprep/tasks/main.yml fqcn[action]
ansible/windows/roles/systemprep/tasks/main.yml ignore-errors
ansible/windows/roles/systemprep/tasks/main.yml name[missing]
ansible/windows/roles/systemprep/tasks/ssh-archive.yml fqcn[action]
ansible/windows/roles/systemprep/tasks/ssh-feature.yml fqcn[action]
ansible/windows/roles/systemprep/tasks/ssh-feature.yml schema[tasks]
6 changes: 3 additions & 3 deletions images/capi/ansible/firstboot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
firstboot_custom_roles_post: ""

tasks:
- include_role:
- ansible.builtin.include_role:
name: "{{ role }}"
loop: "{{ firstboot_custom_roles_pre.split() }}"
loop_control:
loop_var: role
when: firstboot_custom_roles_pre != ""
- include_role:
- ansible.builtin.include_role:
name: firstboot
- include_role:
- ansible.builtin.include_role:
name: "{{ role }}"
loop: "{{ firstboot_custom_roles_post.split() }}"
loop_control:
Expand Down
16 changes: 8 additions & 8 deletions images/capi/ansible/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@
custom_role_names: ""

tasks:
- include_role:
- ansible.builtin.include_role:
name: "{{ role }}"
loop: "{{ node_custom_roles_pre.split() }}"
loop_control:
loop_var: role
when: node_custom_roles_pre != ""
- include_role:
- ansible.builtin.include_role:
name: node
- include_role:
- ansible.builtin.include_role:
name: providers
- include_role:
- ansible.builtin.include_role:
name: containerd
- include_role:
- ansible.builtin.include_role:
name: kubernetes
- include_role:
- ansible.builtin.include_role:
name: load_additional_components
when: load_additional_components | bool
- include_role:
- ansible.builtin.include_role:
name: "{{ role }}"
loop: "{{ custom_role_names.split() + node_custom_roles_post.split() }}"
loop_control:
loop_var: role
when: custom_role_names != "" or node_custom_roles_post != ""
- include_role:
- ansible.builtin.include_role:
name: sysprep

environment:
Expand Down
2 changes: 1 addition & 1 deletion images/capi/ansible/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
become: true

tasks:
- include_role:
- ansible.builtin.include_role:
name: python

environment:
Expand Down
2 changes: 1 addition & 1 deletion images/capi/ansible/roles/containerd/tasks/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
# limitations under the License.
---
- name: Install libseccomp2 package
apt:
ansible.builtin.apt:
name: libseccomp2
state: present
Loading

0 comments on commit 04a3618

Please sign in to comment.