iamthefij/orchestration-tests
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use default arch maps where possible

Browse Source
This commit is contained in:
IamTheFij 2022-08-30 16:15:12 -07:00
parent 92a60cbe3b
commit 444782a0a6
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nomad/setup-cluster.yml
View File

@ -22,11 +22,6 @@
consul_group: bin consul_group: bin
consul_manage_group: true consul_manage_group: true
consul_architecture_map:
x86_64: amd64
armhfv6: arm
armv7l: arm
# consul_tls_enable: true # consul_tls_enable: true
consul_connect_enabled: true consul_connect_enabled: true
consul_ports_grpc: 8502 consul_ports_grpc: 8502
@ -247,8 +242,11 @@
hosts: nomad_instances hosts: nomad_instances
become: true become: true
vars: vars:
deb_arch: "{% if ansible_architecture == 'x86_64' %}amd64{% elif ansible_architecture == 'armv7l' %}armhf{% elif ansible_architecture == 'aarch64' %}arm64{% endif %}" docker_architecture_map:
docker_apt_arch: "{{ deb_arch }}" x86_64: amd64
armv7l: armhf
aarch64: arm64
docker_apt_arch: "{{ docker_architecture_map[ansible_architecture] }}"
docker_compose_arch: "{{ (ansible_architecture == 'armv7l') | ternary('armv7', ansible_architecture) }}" docker_compose_arch: "{{ (ansible_architecture == 'armv7l') | ternary('armv7', ansible_architecture) }}"
roles: roles:
- geerlingguy.docker - geerlingguy.docker
@ -302,18 +300,6 @@
nomad_bin_dir: /usr/bin nomad_bin_dir: /usr/bin
nomad_install_from_repo: true nomad_install_from_repo: true
# nomad_user: root
# nomad_manage_user: true
# nomad_group: bin
# nomad_manage_group: true
# Properly map install arch
nomad_architecture_map:
x86_64: amd64
armhfv6: arm
armv7l: arm
aarch64: arm64
nomad_autopilot: true nomad_autopilot: true
nomad_encrypt_enable: true nomad_encrypt_enable: true
# nomad_use_consul: true # nomad_use_consul: true