FIX: Ansible

+ Cover all CSIT devices with netplan to prevent DHCP usage
+ Move netplan to common role

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ic3790f8ff770edf64b4066f8ddb99454643f5846

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 fb0d77d..915fc0b 100644 (file)
--- 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 a2d2c20..39a401a 100644 (file)
--- 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'