aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-10-09 10:03:04 +0000
committerPeter Mikus <pmikus@cisco.com>2019-10-09 14:35:46 +0000
commita9a3a18b4477e79d18f2f585a15b04de87f94abb (patch)
treec6a1fda6eb5b800abe9cb1e42ae1c396f8e1e3e5 /resources
parent18479deef4bc6fba143492f538cd4139c38e44ab (diff)
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
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/files/netplan_config (renamed from resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config)0
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml9
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml9
3 files changed, 9 insertions, 9 deletions
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
index 694bff1f4f..694bff1f4f 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config
+++ b/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'