From a9a3a18b4477e79d18f2f585a15b04de87f94abb Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 9 Oct 2019 10:03:04 +0000
Subject: 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
---
 .../testbed-setup/ansible/roles/common/files/netplan_config  | 12 ++++++++++++
 .../tools/testbed-setup/ansible/roles/common/tasks/main.yaml |  9 +++++++++
 .../testbed-setup/ansible/roles/tg_sut/files/netplan_config  | 12 ------------
 .../tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml |  9 ---------
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 resources/tools/testbed-setup/ansible/roles/common/files/netplan_config
 delete mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config

(limited to 'resources/tools/testbed-setup')

diff --git a/resources/tools/testbed-setup/ansible/roles/common/files/netplan_config b/resources/tools/testbed-setup/ansible/roles/common/files/netplan_config
new file mode 100644
index 0000000000..694bff1f4f
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/common/files/netplan_config
@@ -0,0 +1,12 @@
+# 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') }} ]
+      dhcp4: false
+      gateway4: {{ ansible_default_ipv4["gateway"] }}
+      nameservers:
+        addresses: [ {{ name_servers }} ]
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/files/netplan_config b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config
deleted file mode 100644
index 694bff1f4f..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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') }} ]
-      dhcp4: false
-      gateway4: {{ ansible_default_ipv4["gateway"] }}
-      nameservers:
-        addresses: [ {{ name_servers }} ]
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'
-- 
cgit 1.2.3-korg