From 216073ac4b05619d9e9fc73131075597196af753 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 22 May 2020 14:46:43 +0000 Subject: Infra: Ansible Nomad II Signed-off-by: pmikus Change-Id: Iaa5c02d14223b578c316f48e31a0b3613303eecf --- .../inventories/lf_inventory/host_vars/10.30.51.28.yaml | 15 ++++++++++++--- .../inventories/lf_inventory/host_vars/10.30.51.29.yaml | 11 +++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.30.yaml | 16 ++++++++++++++-- 3 files changed, 35 insertions(+), 7 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/inventories') diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml index aca60b645e..9aaf2077d2 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml @@ -3,7 +3,8 @@ hostname: "s41-nomad" inventory_cimc_hostname: '10.30.50.28' -# User managmeent. + +# User management. users: - username: localadmin groups: [adm, sudo] @@ -17,8 +18,15 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" # Nomad settings. +nomad_certificates: + - src: "{{ vault_s41_nomad_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_s41_nomad_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_s41_nomad_key_file }}" + dest: "{{ nomad_key_file }}" nomad_datacenter: "yul1" -nomad_name: "s40-nomad-{{ ansible_architecture }}" +nomad_name: "s41-nomad-{{ ansible_architecture }}" nomad_node_role: "client" nomad_node_class: "builder" nomad_options: @@ -26,4 +34,5 @@ nomad_options: docker.cleanup.image: false docker.privileged.enabled: true driver.whitelist: "docker,raw_exec,exec" -nomad_servers: "\"10.30.51.32:4647\", \"10.30.51.33:4647\"" + fingerprint.network.disallow_link_local: true +nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml index 2eb2dfc88c..ca2c7ff5a6 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml @@ -4,7 +4,7 @@ hostname: "s39-nomad" inventory_cimc_hostname: "10.30.50.29" -# User managmeent. +# User management. users: - username: localadmin groups: [adm, sudo] @@ -18,6 +18,13 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" # Nomad settings. +nomad_certificates: + - src: "{{ vault_s39_nomad_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_s39_nomad_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_s39_nomad_key_file }}" + dest: "{{ nomad_key_file }}" nomad_datacenter: "yul1" nomad_name: "s39-nomad-{{ ansible_architecture }}" nomad_node_role: "client" @@ -27,4 +34,4 @@ nomad_options: docker.cleanup.image: false docker.privileged.enabled: true driver.whitelist: "docker,raw_exec,exec" -nomad_servers: "\"10.30.51.32:4647\", \"10.30.51.33:4647\"" +nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml index 3aed1c8b52..fe96d08bc0 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml @@ -4,7 +4,7 @@ hostname: "s40-nomad" inventory_cimc_hostname: '10.30.50.30' -# User managmeent. +# User management. users: - username: localadmin groups: [adm, sudo] @@ -18,7 +18,15 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" # Nomad settings. +nomad_certificates: + - src: "{{ vault_s40_nomad_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_s40_nomad_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_s40_nomad_key_file }}" + dest: "{{ nomad_key_file }}" nomad_datacenter: "yul1" +nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" nomad_name: "s40-nomad-{{ ansible_architecture }}" nomad_node_role: "both" nomad_node_class: "builder" @@ -27,4 +35,8 @@ nomad_options: docker.cleanup.image: false docker.privileged.enabled: true driver.whitelist: "docker,raw_exec,exec" -nomad_servers: "\"10.30.51.32:4647\", \"10.30.51.33:4647\"" + fingerprint.network.disallow_link_local: true +nomad_retry_servers: [ "10.30.51.32", "10.30.51.33" ] +nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] + + -- cgit 1.2.3-korg