Improve host-setup ansible scripts

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

28 files changed, 26 insertions, 8 deletions

diff --git a/resources/tools/testbed-setup/ansible/group_vars/haswell.yaml b/resources/tools/testbed-setup/ansible/group_vars/haswell.yaml
deleted file mode 100644
index 1242115e98..0000000000
--- a/resources/tools/testbed-setup/ansible/group_vars/haswell.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# file: group_vars/haswell/tg.yaml
-
-isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/group_vars/skylake.yaml b/resources/tools/testbed-setup/ansible/group_vars/skylake.yaml
deleted file mode 100644
index 7ea3ec3c9e..0000000000
--- a/resources/tools/testbed-setup/ansible/group_vars/skylake.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# file: group_vars/skylake/tg.yaml
-
-isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
index 4407a51d9a..8a841cae09 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.16.yaml
 
 hostname: "t1-tg1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
index 15ad8f7e1c..e770668ee9 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.17.yaml
 
 hostname: "t1-sut1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
index 0d6528bf8f..d8c128e302 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.18.yaml
 
 hostname: "t1-sut2"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
index fa3c25195b..082b706c3f 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.20.yaml
 
 hostname: "t2-tg1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
index 4c9d91af2b..00f886e0a8 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.21.yaml
 
 hostname: "t2-sut1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
index dc8f80e4ea..4b39d8e3b7 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.22.yaml
 
 hostname: "t2-sut2"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
index 5d8fb50e04..3fbb919fb1 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.24.yaml
 
 hostname: "t3-tg1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
index c10ad67cce..9a6c5a3aca 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.25.yaml
 
 hostname: "t3-sut1"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
index 9627a22a9b..4c95b8aee5 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.26.yaml
 
 hostname: "t3-sut2"
+isolcpus: "1-17,19-35"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
index e79304fd45..7a07e88012 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.44.yaml
 
 hostname: "s3-t21-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
index 1c3c83f1e2..01c331630a 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.45.yaml
 
 hostname: "s4-t21-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
index b401af4683..6c1baf80d6 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.46.yaml
 
 hostname: "s11-t31-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
index 78a4619fdd..a4d9da8e7e 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.47.yaml
 
 hostname: "s12-t31-sut2"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
index 153904582b..2aa3bdfd60 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.48.yaml
 
 hostname: "s13-t31-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
index 598ccff127..687b1f65eb 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.49.yaml
 
 hostname: "s17-t33-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
index 964dfd2344..b783a3ff25 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.50.yaml
 
 hostname: "s1-t11-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
index 041cb574e3..3f2e6a164b 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.51.yaml
 
 hostname: "s2-t12-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
index 3e4010445f..2f89fb6784 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.52.yaml
 
 hostname: "s5-t22-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
index 7de97b5ae5..2b91d82ea3 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.53.yaml
 
 hostname: "s6-t22-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
index fd1314d8fc..3e4125626f 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.54.yaml
 
 hostname: "s7-t23-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
index 93a86f3bd4..ba51b44675 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.55.yaml
 
 hostname: "s8-t23-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
index 6c0906317c..2662447404 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.56.yaml
 
 hostname: "s9-t24-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
index dfacea836b..b28efb4e68 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.57.yaml
 
 hostname: "s10-t24-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
index cab744a12c..68551122dc 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.58.yaml
 
 hostname: "s14-t32-sut1"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
index 867e955423..938f3cf511 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.59.yaml
 
 hostname: "s15-t32-sut2"
+isolcpus: "1-27,29-55,57-83,85-111"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
index 0b591cfc4b..870d612e43 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
@@ -2,3 +2,4 @@
 # file: host_vars/10.30.51.60.yaml
 
 hostname: "s16-t32-tg1"
+isolcpus: "1-27,29-55,57-83,85-111"