From bd9e60523657f04c8fa298149425e4c5ca08dbaf Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 25 May 2020 15:44:18 +0000 Subject: [PATCH] Infra: Ansible Nomad IV Signed-off-by: pmikus Change-Id: I67ab84c2c2b34ce5ccc3a2de629c41460bb52e8c --- .../lf_inventory/host_vars/10.30.51.13.yaml | 6 ---- .../lf_inventory/host_vars/10.30.51.14.yaml | 6 ---- .../lf_inventory/host_vars/10.30.51.30.yaml | 2 +- .../lf_inventory/host_vars/10.30.51.50.yaml | 2 +- .../lf_inventory/host_vars/10.30.51.51.yaml | 2 +- .../lf_inventory/host_vars/10.30.51.67.yaml | 27 +++++++++++++++ .../lf_inventory/host_vars/10.30.51.68.yaml | 27 +++++++++++++++ .../lf_inventory/host_vars/10.30.51.69.yaml | 19 ++++++++++ .../lf_inventory/host_vars/10.32.8.14.yaml | 2 +- .../lf_inventory/host_vars/10.32.8.15.yaml | 2 +- .../lf_inventory/host_vars/10.32.8.16.yaml | 40 ++++++++++++++++++++++ .../ansible/inventories/lf_inventory/hosts | 3 ++ 12 files changed, 121 insertions(+), 17 deletions(-) create mode 100644 resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml create mode 100644 resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml create mode 100644 resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.13.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.13.yaml index 2b9ea68cc3..443f7255f8 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.13.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.13.yaml @@ -28,11 +28,5 @@ nomad_datacenter: "yul1" nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" nomad_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "server" -nomad_node_class: "builder" -nomad_options: - driver.raw_exec.enable: 1 - docker.cleanup.image: false - docker.privileged.enabled: true - driver.whitelist: "docker,raw_exec,exec" nomad_retry_servers: [ "10.30.51.32", "10.30.51.33", "10.30.51.14" ] nomad_servers: [ "10.30.51.13:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.14.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.14.yaml index 105ba4248f..4da927ebd4 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.14.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.14.yaml @@ -28,11 +28,5 @@ nomad_datacenter: "yul1" nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" nomad_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "server" -nomad_node_class: "builder" -nomad_options: - driver.raw_exec.enable: 1 - docker.cleanup.image: false - docker.privileged.enabled: true - driver.whitelist: "docker,raw_exec,exec" nomad_retry_servers: [ "10.30.51.32", "10.30.51.33", "10.30.51.13" ] nomad_servers: [ "10.30.51.13: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 bae348b9c6..5b8133ef84 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 @@ -1,4 +1,4 @@ -u--- +--- # file: host_vars/10.30.51.30.yaml hostname: "s40-nomad" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index fb20386863..7f1f3b95d1 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -17,7 +17,7 @@ nomad_certificates: - src: "{{ vault_nomad_v1_key_file }}" dest: "{{ nomad_key_file }}" nomad_datacenter: "yul1" -nomad_name: "s1-t11-sut1-{{ ansible_architecture }}" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" nomad_node_class: "csit" nomad_options: diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index b707c2de2c..89809c8917 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -17,7 +17,7 @@ nomad_certificates: - src: "{{ vault_nomad_v1_key_file }}" dest: "{{ nomad_key_file }}" nomad_datacenter: "yul1" -nomad_name: "s2-t12-sut1-{{ ansible_architecture }}" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" nomad_node_class: "csit" nomad_options: diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml new file mode 100644 index 0000000000..e718940390 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml @@ -0,0 +1,27 @@ +--- +# file: host_vars/10.30.51.67.yaml + +hostname: "s49-nomad" +vfs_data_file: "csit-initialize-vfs-tx2.sh" +grub: + nr_hugepages: 57344 +cpu_microarchitecture: "thunderx2" + +# Nomad settings. +nomad_certificates: + - src: "{{ vault_nomad_v1_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_nomad_v1_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_nomad_v1_key_file }}" + dest: "{{ nomad_key_file }}" +nomad_datacenter: "yul1" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" +nomad_node_role: "client" +nomad_node_class: "builder" +nomad_options: + driver.raw_exec.enable: 0 + 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" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml new file mode 100644 index 0000000000..a78a39766c --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml @@ -0,0 +1,27 @@ +--- +# file: host_vars/10.30.51.68.yaml + +hostname: "s50-nomad" +vfs_data_file: "csit-initialize-vfs-tx2.sh" +grub: + nr_hugepages: 57344 +cpu_microarchitecture: "thunderx2" + +# Nomad settings. +nomad_certificates: + - src: "{{ vault_nomad_v1_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_nomad_v1_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_nomad_v1_key_file }}" + dest: "{{ nomad_key_file }}" +nomad_datacenter: "yul1" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" +nomad_node_role: "client" +nomad_node_class: "builder" +nomad_options: + driver.raw_exec.enable: 1 + 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" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml index 7d0be75718..1d9062c5f6 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml @@ -6,3 +6,22 @@ vfs_data_file: "csit-initialize-vfs-tx2.sh" grub: nr_hugepages: 57344 cpu_microarchitecture: "thunderx2" + +# Nomad settings. +nomad_certificates: + - src: "{{ vault_nomad_v1_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_nomad_v1_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_nomad_v1_key_file }}" + dest: "{{ nomad_key_file }}" +nomad_datacenter: "yul1" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" +nomad_node_role: "client" +nomad_node_class: "csitarm" +nomad_options: + driver.raw_exec.enable: 1 + 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" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml index f1a4b6d6af..3f426b79ec 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml @@ -32,7 +32,7 @@ nomad_node_role: "both" nomad_node_class: "s5ci" nomad_options: driver.raw_exec.enable: 1 - docker.cleanup.image: false + docker.cleanup.image: true docker.privileged.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml index ad993521fa..e91dcda023 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml @@ -32,7 +32,7 @@ nomad_node_role: "both" nomad_node_class: "builder" nomad_options: driver.raw_exec.enable: 1 - docker.cleanup.image: false + docker.cleanup.image: true docker.privileged.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml new file mode 100644 index 0000000000..33d5dede5e --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml @@ -0,0 +1,40 @@ +--- +# file: host_vars/10.32.8.16.yaml + +hostname: "s48-nomad" +inventory_ipmi_hostname: "10.30.55.16" + +# User management. +users: + - username: localadmin + groups: [adm, sudo] + password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1" + ssh_key: + - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" + - username: testuser + groups: [adm, sudo] + password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1" + ssh_key: + - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" + +# Nomad settings. +nomad_certificates: + - src: "{{ vault_nomad_v3_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_nomad_v3_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_nomad_v3_key_file }}" + dest: "{{ nomad_key_file }}" +nomad_datacenter: "yul1" +nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" +nomad_node_role: "both" +nomad_node_class: "s5ci" +nomad_options: + driver.raw_exec.enable: 1 + docker.cleanup.image: true + docker.privileged.enabled: true + driver.whitelist: "docker,raw_exec,exec" + fingerprint.network.disallow_link_local: true +nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ] +nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts index ea3a6f58bf..7188d5143a 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts @@ -56,3 +56,6 @@ all: 10.30.51.14: #s45-nomad - arm 10.32.8.14: #s46-nomad - skylake 10.32.8.15: #s47-nomad - skylake + 10.32.8.16: #s48-nomad - skylake + 10.30.51.67: #s49-nomad - thunderx 88xx + 10.30.51.68: #s50-nomad - thunderx 88xx -- 2.16.6