diff options
Diffstat (limited to 'fdio.infra.ansible/inventories/lf_inventory/host_vars')
27 files changed, 121 insertions, 367 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml index b28cae11ff..a86631695e 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -56,6 +57,7 @@ nomad_servers: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -79,7 +81,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml index 8d7223495b..196f8b6745 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -56,6 +57,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -79,7 +81,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml index 8c3afaf74c..70b75f7e20 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -60,6 +61,7 @@ nomad_volumes: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -83,7 +85,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml index cb65e81c26..6bb2c1fd57 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -60,6 +61,7 @@ nomad_volumes: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -83,7 +85,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml index 20e45a90ea..c016c56961 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -60,6 +61,7 @@ nomad_volumes: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -83,7 +85,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml index 0d71009ede..99333dd2e6 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -39,6 +39,7 @@ nomad_options: docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -60,6 +61,7 @@ nomad_volumes: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -83,7 +85,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml index 745686c31e..4383dd2499 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -37,6 +37,8 @@ nomad_options: docker.privileged.enabled: true docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" + fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -54,8 +56,9 @@ nomad_servers: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -77,7 +80,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml index 5a3c8896fc..329b0dc9af 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -37,6 +37,8 @@ nomad_options: docker.privileged.enabled: true docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" + fingerprint.network.disallow_link_local: true + artifact.disable_filesystem_isolation: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -54,8 +56,9 @@ nomad_servers: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -77,7 +80,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml index 543f557d6e..da85d7661f 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml @@ -28,7 +28,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -63,6 +63,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -86,12 +87,12 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: default-shm-size: "1073741824" - dns: ["172.17.0.1"] - dns-opts: [] - dns-search: ["{{ ansible_hostname }}"] + # dns: ["172.17.0.1"] + #dns-opts: [] + #dns-search: ["{{ ansible_hostname }}"] host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml index 1c80c5d4a6..4e9f1da943 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.31.yaml @@ -28,7 +28,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -63,6 +63,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -86,7 +87,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml index 1db367bd67..800cab9bcb 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml @@ -1,23 +1,25 @@ --- # file: host_vars/10.30.51.36.yaml -hostname: "s17-t33-sut1" +hostname: "s36-t27-sut1" grub: audit: "0" default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" iommu.passthrough: "1" - vfio.enable_unsafe_noiommu_mode: 1 - isolcpus: "1-10,17-26,33-42,49-58" + isolcpus: "1-71" nmi_watchdog: "0" - nohz_full: "1-10,17-26,33-42,49-58" + nohz_full: "1-71" nosoftlockup: true processor.max_cstate: "1" - rcu_nocbs: "1-10,17-26,33-42,49-58" + rcu_nocbs: "1-71" sysctl: kernel: - watchdog_cpumask: "0,11-16,27-32,43-48,59-63" + watchdog_cpumask: "0,71" vm: nr_hugepages: 32768 + max_map_count: 20000 inventory_ipmi_hostname: "10.30.50.36" -cpu_microarchitecture: "taishan" +cpu_microarchitecture: "grace" + +mellanox_matrix: "dpdk24.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml index 7d3188251a..81794519b3 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml @@ -1,23 +1,45 @@ --- # file: host_vars/10.30.51.37.yaml -hostname: "s18-t33-sut2" +hostname: "s37-t27-tg1" grub: audit: "0" default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" - iommu.passthrough: "1" - vfio.enable_unsafe_noiommu_mode: 1 - isolcpus: "1-10,17-26,33-42,49-58" + hpet: "disable" + intel_idle.max_cstate: "1" + intel_iommu: "on" + intel_pstate: "disable" + iommu: "pt" + isolcpus: "1-31,33-63,65-95,97-127" + mce: "off" nmi_watchdog: "0" - nohz_full: "1-10,17-26,33-42,49-58" + nohz_full: "1-31,33-63,65-95,97-127" nosoftlockup: true + numa_balancing: "disable" processor.max_cstate: "1" - rcu_nocbs: "1-10,17-26,33-42,49-58" + rcu_nocbs: "1-31,33-63,65-95,97-127" + tsc: "reliable" sysctl: kernel: - watchdog_cpumask: "0,11-16,27-32,43-48,59-63" + watchdog_cpumask: "0,32,64,96" vm: nr_hugepages: 32768 + max_map_count: 20000 inventory_ipmi_hostname: "10.30.50.37" -cpu_microarchitecture: "taishan" +cpu_microarchitecture: "cascadelake" + +mellanox_matrix: "dpdk24.07" + +docker_tg: true +docker_volumes: + - source: "/usr/bin/ofed_info" + target: "/usr/bin/ofed_info" + - source: "/dev/hugepages" + target: "/dev/hugepages" + - source: "/dev/vfio" + target: "/dev/vfio" + - source: "/etc/sudoers" + target: "/etc/sudoers" + - source: "/usr/lib/firmware/" + target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml deleted file mode 100644 index 3b9b63dfd0..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# file: host_vars/10.30.51.49.yaml - -hostname: "s19-t33t211-tg1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=16384" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-27,29-55,57-83,85-111" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-27,29-55,57-83,85-111" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-27,29-55,57-83,85-111" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,28,56,84" - vm: - nr_hugepages: 16384 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.50.46" -cpu_microarchitecture: "skylake" -docker_tg: true - -intel_700_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index 117c6d2c31..608e959e2a 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -1,16 +1,8 @@ --- # file: host_vars/10.30.51.50.yaml -hostname: "s1-t11-sut1" -grub: - hugepagesz: "2M" - hugepages: 32768 - iommu: "on" - vfio.enable_unsafe_noiommu_mode: 1 +hostname: "s50-nomad" inventory_ipmi_hostname: "10.30.50.47" -cpu_microarchitecture: "skylake" - -intel_800_matrix: "dpdk22.03" # User management. users: @@ -27,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -38,7 +30,7 @@ nomad_certificates: nomad_datacenter: "yul1" nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" -nomad_node_class: "csit" +nomad_node_class: "hst" nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false @@ -62,8 +54,9 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -85,12 +78,10 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: - default-shm-size: "1073741824" dns: ["172.17.0.1"] dns-opts: [] dns-search: ["{{ ansible_hostname }}"] - host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index 875b759675..e778a9e9f6 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -1,16 +1,8 @@ --- # file: host_vars/10.30.51.51.yaml -hostname: "s2-t12-sut1" -grub: - hugepagesz: "2M" - hugepages: 32768 - iommu: "on" - vfio.enable_unsafe_noiommu_mode: 1 +hostname: "s51-nomad" inventory_ipmi_hostname: "10.30.50.48" -cpu_microarchitecture: "skylake" - -intel_800_matrix: "dpdk22.03" # User management. users: @@ -27,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -38,7 +30,7 @@ nomad_certificates: nomad_datacenter: "yul1" nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" -nomad_node_class: "csit" +nomad_node_class: "hst" nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false @@ -62,8 +54,9 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -85,12 +78,10 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: - default-shm-size: "1073741824" dns: ["172.17.0.1"] dns-opts: [] dns-search: ["{{ ansible_hostname }}"] - host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml deleted file mode 100644 index 3b5bb0be8a..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -# file: host_vars/10.30.51.69.yaml - -hostname: "s27-t211-sut1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" - iommu.passthrough: "1" - isolcpus: "1-10,29-38" - nmi_watchdog: "0" - nohz_full: "1-10,29-38" - nosoftlockup: true - processor.max_cstate: "1" - rcu_nocbs: "1-10,29-38" -sysctl: - kernel: - watchdog_cpumask: "0,11-28,39-55" - vm: - nr_hugepages: 32768 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.50.69" -cpu_microarchitecture: "thunderx2" - -# User management. -users: - - username: localadmin - groups: [adm, sudo] - password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1" - ssh_key: - - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKM1D1kkGX1l7fSma1MOgw2yLI7zJHwTCcfVROQ4hh7r peter.mikus@protonmail.ch" - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes" - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWWDIudZUaHp6pPkYmBsBeEYcbUoGGZH73eB374g8e9V3dfT7BuJOMR/Z3LxCGw5GcDDgzJHLQr8AykN7lUscaux68CXSf1CAKhfBeWBOCQD4G5tpmD6610jsiBig6bFISKpGW4nLt80yt3bKEqv6ezt35QuMeh3E45uK/pCRfDcukOThbwYG44xr7TeYAyNacWuNV9HDy5DzjBelElmolTOgjtZEbedmIcUbV/gb8yekUxxBTS3d3I5qVLtNRMHPqp9xbJqteRXIphizDlHbaTHZeVy9mrwi1RuTjDSg7p1OPJ9eVIzMYzk87gbwNxZw8481Xb1WsgGmyH/mXJjD1 najoy@NAJOY-M-505G.CISCO.COM" - - username: testuser - groups: [adm, sudo] - password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1" - ssh_key: - - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKM1D1kkGX1l7fSma1MOgw2yLI7zJHwTCcfVROQ4hh7r peter.mikus@protonmail.ch" - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes" - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWWDIudZUaHp6pPkYmBsBeEYcbUoGGZH73eB374g8e9V3dfT7BuJOMR/Z3LxCGw5GcDDgzJHLQr8AykN7lUscaux68CXSf1CAKhfBeWBOCQD4G5tpmD6610jsiBig6bFISKpGW4nLt80yt3bKEqv6ezt35QuMeh3E45uK/pCRfDcukOThbwYG44xr7TeYAyNacWuNV9HDy5DzjBelElmolTOgjtZEbedmIcUbV/gb8yekUxxBTS3d3I5qVLtNRMHPqp9xbJqteRXIphizDlHbaTHZeVy9mrwi1RuTjDSg7p1OPJ9eVIzMYzk87gbwNxZw8481Xb1WsgGmyH/mXJjD1 najoy@NAJOY-M-505G.CISCO.COM" - -intel_700_matrix: "dpdk23.11" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index 2337277144..71c6522bdd 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -10,7 +10,8 @@ inventory_ipmi_hostname: "10.30.50.70" vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "altra" -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk22.03" +mellanox_matrix: "dpdk23.11" # User management. users: @@ -29,7 +30,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -64,6 +65,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -87,7 +89,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml index 1d414b32c7..baee725a4f 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml @@ -10,7 +10,8 @@ inventory_ipmi_hostname: "10.30.50.71" vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "altra" -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk22.03" +mellanox_matrix: "dpdk23.11" # User management. users: @@ -29,7 +30,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -64,6 +65,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -87,7 +89,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml index 7ab0d8ab68..0061ce680e 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml @@ -4,26 +4,26 @@ hostname: "s89-t39t310-tg1" grub: audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" + default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192" hpet: "disable" intel_idle.max_cstate: "1" intel_iommu: "on" intel_pstate: "disable" iommu: "pt" - isolcpus: "1-31,33-63,65-95,97-127" + isolcpus: "1-27,29-55,57-83,85-111" mce: "off" nmi_watchdog: "0" - nohz_full: "1-31,33-63,65-95,97-127" + nohz_full: "1-27,29-55,57-83,85-111" nosoftlockup: true numa_balancing: "disable" processor.max_cstate: "1" - rcu_nocbs: "1-31,33-63,65-95,97-127" + rcu_nocbs: "1-27,29-55,57-83,85-111" tsc: "reliable" sysctl: kernel: - watchdog_cpumask: "0,32,64,96" + watchdog_cpumask: "0,28,56,84" vm: - nr_hugepages: 32768 + nr_hugepages: 8192 max_map_count: 20000 inventory_ipmi_hostname: "10.30.50.89" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml index 53239492ef..6765e72877 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml @@ -20,7 +20,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -38,6 +38,7 @@ nomad_options: docker.privileged.enabled: true docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" + fingerprint.network.disallow_link_local: true nomad_service_mgr: "systemd" nomad_consul_use_ssl: false nomad_use_tls: false @@ -55,8 +56,9 @@ nomad_servers: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -79,7 +81,7 @@ consul_service_mgr: "systemd" #consul_package_version: "1.5.2+dfsg2-14" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml index 19ec70ce83..81386c82e5 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml @@ -20,7 +20,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -55,8 +55,9 @@ nomad_servers: # Consul settings. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -79,7 +80,7 @@ consul_service_mgr: "systemd" #consul_package_version: "1.5.2+dfsg2-14" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml deleted file mode 100644 index 4423a36f56..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.18.yaml - -hostname: "s33-t27-sut1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-23,25-47,49-71,73-95" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-23,25-47,49-71,73-95" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-23,25-47,49-71,73-95" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,24,48,72" - vm: - nr_hugepages: 32768 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.18" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk23.11" -intel_800_matrix: "dpdk23.11" -mellanox_matrix: "dpdk23.11" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml deleted file mode 100644 index 22210ae4bd..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.19.yaml - -hostname: "s34-t27-tg1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-27,29-55,57-83,85-111" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-27,29-55,57-83,85-111" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-27,29-55,57-83,85-111" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,28,56,84" - vm: - nr_hugepages: 8192 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.19" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk22.07" -intel_800_matrix: "dpdk22.07" -mellanox_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml deleted file mode 100644 index 36ba5c15f8..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.20.yaml - -hostname: "s35-t28-sut1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-23,25-47,49-71,73-95" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-23,25-47,49-71,73-95" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-23,25-47,49-71,73-95" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,24,48,72" - vm: - nr_hugepages: 32768 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.20" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk23.11" -intel_800_matrix: "dpdk23.11" -mellanox_matrix: "dpdk23.11" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml deleted file mode 100644 index 61c6f51b06..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.21.yaml - -hostname: "s36-t28-tg1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-27,29-55,57-83,85-111" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-27,29-55,57-83,85-111" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-27,29-55,57-83,85-111" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,28,56,84" - vm: - nr_hugepages: 8192 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.21" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk22.07" -intel_800_matrix: "dpdk22.07" -mellanox_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml deleted file mode 100644 index ae2947f54a..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.22.yaml - -hostname: "s37-t29-sut1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=32768" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-23,25-47,49-71,73-95" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-23,25-47,49-71,73-95" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-23,25-47,49-71,73-95" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,24,48,72" - vm: - nr_hugepages: 32768 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.22" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk23.11" -intel_800_matrix: "dpdk23.11" -mellanox_matrix: "dpdk23.11"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml deleted file mode 100644 index a3f19b4249..0000000000 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# file: host_vars/10.32.8.23.yaml - -hostname: "s38-t29-tg1" -grub: - audit: "0" - default_hugepagesz: "2M hugepagesz=1G hugepages=32 hugepagesz=2M hugepages=8192" - hpet: "disable" - intel_idle.max_cstate: "1" - intel_iommu: "on" - intel_pstate: "disable" - iommu: "pt" - isolcpus: "1-27,29-55,57-83,85-111" - mce: "off" - nmi_watchdog: "0" - nohz_full: "1-27,29-55,57-83,85-111" - nosoftlockup: true - numa_balancing: "disable" - processor.max_cstate: "1" - rcu_nocbs: "1-27,29-55,57-83,85-111" - tsc: "reliable" -sysctl: - kernel: - watchdog_cpumask: "0,28,56,84" - vm: - nr_hugepages: 8192 - max_map_count: 20000 - -inventory_ipmi_hostname: "10.30.55.23" -cpu_microarchitecture: "cascadelake" - -intel_700_matrix: "dpdk22.07" -intel_800_matrix: "dpdk22.07" -mellanox_matrix: "dpdk22.07" |