From a9a3a18b4477e79d18f2f585a15b04de87f94abb Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 9 Oct 2019 10:03:04 +0000 Subject: [PATCH] FIX: Ansible + Cover all CSIT devices with netplan to prevent DHCP usage + Move netplan to common role Signed-off-by: Peter Mikus Change-Id: Ic3790f8ff770edf64b4066f8ddb99454643f5846 --- .../ansible/roles/{tg_sut => common}/files/netplan_config | 0 .../tools/testbed-setup/ansible/roles/common/tasks/main.yaml | 9 +++++++++ .../tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml | 9 --------- 3 files changed, 9 insertions(+), 9 deletions(-) rename resources/tools/testbed-setup/ansible/roles/{tg_sut => common}/files/netplan_config (100%) diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config b/resources/tools/testbed-setup/ansible/roles/common/files/netplan_config similarity index 100% rename from resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config rename to resources/tools/testbed-setup/ansible/roles/common/files/netplan_config diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml index fb0d77d18c..915fc0bbd0 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml @@ -46,6 +46,15 @@ - meta: flush_handlers +- name: Copy netplan network config file + template: + src: 'files/netplan_config' + dest: '/etc/netplan/01-netcfg.yaml' + owner: 'root' + group: 'root' + mode: '0644' + tags: copy-interface-file + - name: Add permanent proxy settings lineinfile: path: '/etc/environment' diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml index a2d2c2061a..39a401a7de 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml @@ -14,15 +14,6 @@ when: cpu_microarchitecture == "skylake" or cpu_microarchitecture == "cascadelake" tags: [ install-msr, disable-turbo-boost ] -- name: Copy netplan network config file - template: - src: 'files/netplan_config' - dest: '/etc/netplan/01-netcfg.yaml' - owner: 'root' - group: 'root' - mode: '0644' - tags: copy-interface-file - - name: Copy CSIT sysctl file template: src: 'files/90-csit' -- 2.16.6