move debian_architecture and debian_architecture_translations to defaults

This commit is contained in:
Lee Goolsbee
2020-09-10 12:22:16 -05:00
parent 73a3dea47d
commit cfca6d794c
2 changed files with 8 additions and 15 deletions

View File

@@ -5,3 +5,11 @@ postgres_version: "9.6"
# Disable these when using the product installer, otherwise we end up
# fighting with it.
atl_use_system_jdk: false
# Ubuntu and Ansible use different architecture nomenclature; provide
# an easy method for translating between them
debian_architecture_translations:
x86_64: amd64
aarch64: arm64
debian_architecture: "{{ debian_architecture_translations[ansible_architecture] | default(ansible_architecture) }}"

View File

@@ -3,21 +3,6 @@
- name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
block:
- name: Create translation matrix for ansible_architecture values to Ubuntu/Debian nomenclature
set_fact:
debian_architecture_translations:
x86_64: amd64
aarch64: arm64
- name: Set debian_architecture based on ansible_architecture
set_fact:
debian_architecture: >-
{%- if ansible_architecture in debian_architecture_translations -%}
{{ debian_architecture_translations[ansible_architecture] }}
{%- else -%}
{{ ansible_architecture }}
{%- endif %}
- name: Install gnupg
apt:
name: gnupg