From 1d4a83e6139064068c762118584c80d45228c5fc Mon Sep 17 00:00:00 2001 From: Dennis Hoppe Date: Thu, 15 Apr 2021 12:38:49 +0200 Subject: [PATCH] Define variables tini_architecture and kubectl_architecture in the correct Ansible role --- tools/ansible/roles/dockerfile/defaults/main.yml | 4 ++++ tools/ansible/roles/image_build/defaults/main.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ansible/roles/dockerfile/defaults/main.yml b/tools/ansible/roles/dockerfile/defaults/main.yml index 3d02bb35da..6c568356f0 100644 --- a/tools/ansible/roles/dockerfile/defaults/main.yml +++ b/tools/ansible/roles/dockerfile/defaults/main.yml @@ -4,3 +4,7 @@ kube_dev: false dockerfile_dest: '../..' dockerfile_name: 'Dockerfile' template_dest: '_build' + +# Helper vars to construct the proper download URL for the current architecture +tini_architecture: '{{ { "x86_64": "amd64", "aarch64": "arm64", "armv7": "arm" }[ansible_facts.architecture] }}' +kubectl_architecture: '{{ { "x86_64": "amd64", "aarch64": "arm64", "armv7": "arm" }[ansible_facts.architecture] }}' diff --git a/tools/ansible/roles/image_build/defaults/main.yml b/tools/ansible/roles/image_build/defaults/main.yml index 076a4f47b3..a3e367c175 100644 --- a/tools/ansible/roles/image_build/defaults/main.yml +++ b/tools/ansible/roles/image_build/defaults/main.yml @@ -1,6 +1,2 @@ --- awx_image: quay.io/ansible/awx - -# Helper vars to construct the proper download URL for the current architecture -tini_architecture: '{{ { "x86_64": "amd64", "aarch64": "arm64", "armv7": "arm" }[ansible_facts.architecture] }}' -kubectl_architecture: '{{ { "x86_64": "amd64", "aarch64": "arm64", "armv7": "arm" }[ansible_facts.architecture] }}'