From ab596c32fdda48aa8140f428710b98d47baf9cae Mon Sep 17 00:00:00 2001 From: Stanislav Chlebec Date: Wed, 16 Jan 2019 15:42:36 +0100 Subject: Ansible testbed setup for Taishan testbed Change-Id: I4b42aa5bf7635ade95f81c0c92a6ff1bf43d3fa0 Signed-off-by: Stanislav Chlebec Signed-off-by: juraj.linkes --- .../tools/testbed-setup/ansible/roles/tg_sut/files/90-csit | 2 +- .../ansible/roles/tg_sut/files/interfaces_physical | 14 -------------- .../ansible/roles/tg_sut/files/netplan_config | 11 +++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical create mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config (limited to 'resources/tools/testbed-setup/ansible/roles/tg_sut/files') diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit index 4a57a7c131..e96547e4d7 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit @@ -77,4 +77,4 @@ kernel.randomize_va_space=0 # typically this value would only be touched in the nohz_full case # to re-enable cores that by default were not running the watchdog, # if a kernel lockup was suspected on those cores. -kernel.watchdog_cpumask=0,18 +kernel.watchdog_cpumask={{ cfs_cpus }} diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical deleted file mode 100644 index 734d8cd18f..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical +++ /dev/null @@ -1,14 +0,0 @@ -# This file describes the network interfaces available on your system -# and how to activate them. For more information, see interfaces(5). - -# The loopback network interface -auto lo -iface lo inet loopback - -# The primary network interface -auto {{ ansible_default_ipv4["interface"] }} -iface {{ ansible_default_ipv4["interface"] }} inet static - address {{ ansible_default_ipv4["address"] }} - netmask {{ ansible_default_ipv4["netmask"] }} - gateway {{ ansible_default_ipv4["gateway"] }} - dns-nameservers 199.204.44.24 199.204.47.54 diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config new file mode 100644 index 0000000000..2f34cfbaca --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config @@ -0,0 +1,11 @@ +# This file describes the network interfaces available on your system +# For more information, see netplan(5). +network: + version: 2 + renderer: networkd + ethernets: + {{ ansible_default_ipv4["interface"] }}: + addresses: [ {{ (ansible_default_ipv4.address + '/' + ansible_default_ipv4.netmask) | ipaddr('host/prefix') }} ] + gateway4: {{ ansible_default_ipv4["gateway"] }} + nameservers: + addresses: [ 199.204.44.24, 199.204.47.54 ] -- cgit 1.2.3-korg