Update Ansible with new Skylake machines

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

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 4a3df38..e79304f 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 ---
 # file: host_vars/10.30.51.44.yaml
 
-hostname: "s1-t21-sut1"
+hostname: "s3-t21-sut1"

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 77e69b3..1c3c83f 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 ---
 # file: host_vars/10.30.51.45.yaml
 
-hostname: "s2-t21-tg1"
+hostname: "s4-t21-tg1"

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 e63e1a1..b401af4 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 ---
 # file: host_vars/10.30.51.46.yaml
 
-hostname: "s9-t31-sut1"
+hostname: "s11-t31-sut1"

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 d3f198a..78a4619 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 ---
 # file: host_vars/10.30.51.47.yaml
 
-hostname: "s10-t31-sut2"
+hostname: "s12-t31-sut2"

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 2ec7289..1539045 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 ---
 # file: host_vars/10.30.51.48.yaml
 
-hostname: "s11-t31-tg1"
+hostname: "s13-t31-tg1"

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
new file mode 100644 (file)
index 0000000..964dfd2
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.50.yaml
+
+hostname: "s1-t11-sut1"

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
new file mode 100644 (file)
index 0000000..041cb57
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.51.yaml
+
+hostname: "s2-t12-sut1"

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
new file mode 100644 (file)
index 0000000..3e40104
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.52.yaml
+
+hostname: "s5-t22-sut1"

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
new file mode 100644 (file)
index 0000000..7de97b5
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.53.yaml
+
+hostname: "s6-t22-tg1"

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
new file mode 100644 (file)
index 0000000..fd1314d
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.54.yaml
+
+hostname: "s7-t23-sut1"

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
new file mode 100644 (file)
index 0000000..93a86f3
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.55.yaml
+
+hostname: "s8-t23-tg1"

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
new file mode 100644 (file)
index 0000000..6c09063
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.56.yaml
+
+hostname: "s9-t24-sut1"

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
new file mode 100644 (file)
index 0000000..dfacea8
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.57.yaml
+
+hostname: "s10-t24-tg1"

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
new file mode 100644 (file)
index 0000000..cab744a
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.58.yaml
+
+hostname: "s14-t32-sut1"

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
new file mode 100644 (file)
index 0000000..867e955
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.59.yaml
+
+hostname: "s15-t32-sut2"

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
new file mode 100644 (file)
index 0000000..0b591cf
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
@@ -0,0 +1,4 @@
+---
+# file: host_vars/10.30.51.60.yaml
+
+hostname: "s16-t32-tg1"

diff --git a/resources/tools/testbed-setup/ansible/production b/resources/tools/testbed-setup/ansible/production
index ee25c46..e1703af 100644 (file)
--- a/resources/tools/testbed-setup/ansible/production
+++ b/resources/tools/testbed-setup/ansible/production
@@ -24,14 +24,27 @@ all:
       children:\r
         tg:\r
           hosts:\r
-            10.30.51.45: null #s2-t21-tg1\r
-            10.30.51.48: null #s11-t31-tg1\r
+            10.30.51.45: null #s4-t21-tg1\r
+            10.30.51.48: null #s13-t31-tg1\r
             10.30.51.49: null #s17-t33-tg1\r
+            10.30.51.53: null #s6-t22-tg1\r
+            10.30.51.55: null #s8-t23-tg1\r
+            10.30.51.57: null #s10-t24-tg1\r
+            10.30.51.60: null #s16-t32-tg1\r
         sut:\r
           hosts:\r
-            10.30.51.44: null #s1-t21-sut1\r
-            10.30.51.46: null #s9-t31-sut1\r
-            10.30.51.47: null #s10-t31-sut2\r
+            10.30.51.44: null #s3-t21-sut1\r
+            10.30.51.46: null #s11-t31-sut1\r
+            10.30.51.47: null #s12-t31-sut2\r
+            10.30.51.52: null #s5-t22-sut1\r
+            10.30.51.54: null #s7-t23-sut1\r
+            10.30.51.56: null #s9-t24-sut1\r
+            10.30.51.58: null #s14-t32-sut1\r
+            10.30.51.59: null #s15-t32-sut2\r
+        vppdevice:\r
+          hosts:\r
+            10.30.51.50: null #s1-t11-sut1\r
+            10.30.51.51: null #s2-t12-sut1\r
 #    arm:\r
 #      children:\r
 #        tg:\r

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 c8454f5..cacae75 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
@@ -52,7 +52,7 @@
     path: '/etc/default/grub'\r
     state: 'present'\r
     regexp: '^GRUB_CMDLINE_LINUX='\r
-    line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} intel_pstate=disable"'\r
+    line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable"'\r
   notify: ['Update GRUB']\r
   tags: set-grub\r
 \r

diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index b48ce0f..45808e5 100644 (file)
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -7,5 +7,8 @@
 - import_playbook: sut.yaml\r
   tags: sut\r
 \r
+- import_playbook: vppdevice.yaml\r
+  tags: vppdevice\r
+\r
 - import_playbook: virl.yaml\r
   tags: virl\r

diff --git a/resources/tools/testbed-setup/ansible/vppdevice.yaml b/resources/tools/testbed-setup/ansible/vppdevice.yaml
new file mode 100644 (file)
index 0000000..03e61d3
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/vppdevice.yaml
@@ -0,0 +1,10 @@
+---\r
+# file: vppdevice.yaml\r
+\r
+- hosts: vppdevice\r
+  remote_user: testuser\r
+  become: yes\r
+  become_user: root\r
+  roles:\r
+    - common\r
+    - vppdevice\r

diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf
index 17b0ad7..b22aff7 100644 (file)
--- a/resources/tools/testbed-setup/pxe/dhcpd.conf
+++ b/resources/tools/testbed-setup/pxe/dhcpd.conf
@@ -88,77 +88,77 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
     filename "pxelinux.0";
   }
 # 2-Node Xeon
-  host s1-t21-sut1 {
+  host s3-t21-sut1 {
     hardware ethernet ac:1f:6b:8a:8c:76;
     fixed-address 10.30.51.44;
     filename "pxelinux.0";
   }
-  host s2-t21-tg1 {
+  host s4-t21-tg1 {
     hardware ethernet ac:1f:6b:8a:8c:ea;
     fixed-address 10.30.51.45;
     filename "pxelinux.0";
   }
-#  host s3-t22-sut1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
-#  host s4-t22-tg1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
-#  host s5-t23-sut1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
-#  host s6-t23-tg1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
-#  host s7-t24-sut1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
-#  host s8-t24-tg1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.51.?;
-#    filename "pxelinux.0";
-#  }
+  host s5-t22-sut1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.52;
+    filename "pxelinux.0";
+  }
+  host s6-t22-tg1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.53;
+    filename "pxelinux.0";
+  }
+  host s7-t23-sut1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.54;
+    filename "pxelinux.0";
+  }
+  host s8-t23-tg1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.55;
+    filename "pxelinux.0";
+  }
+  host s9-t24-sut1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.56;
+    filename "pxelinux.0";
+  }
+  host s10-t24-tg1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.57;
+    filename "pxelinux.0";
+  }
 # 3-Node Xeon
-  host s9-t31-sut1 {
+  host s11-t31-sut1 {
     hardware ethernet ac:1f:6b:8a:8d:b6;
     fixed-address 10.30.51.46;
     filename "pxelinux.0";
   }
-  host s10-t31-sut2 {
+  host s12-t31-sut2 {
     hardware ethernet ac:1f:6b:8a:8d:94;
     fixed-address 10.30.51.47;
     filename "pxelinux.0";
   }
-  host s11-t31-tg1 {
+  host s13-t31-tg1 {
     hardware ethernet ac:1f:6b:8a:04:78;
     fixed-address 10.30.51.48;
     filename "pxelinux.0";
   }
-#  host s12-t32-sut1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.50.?;
-#    filename "pxelinux.0";
-#  }
-#  host s13-t32-sut2 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.50.?;
-#    filename "pxelinux.0";
-#  }
-#  host s14-t32-tg1 {
-#    hardware ethernet 00:00:00:00:00:00;
-#    fixed-address 10.30.50.?;
-#    filename "pxelinux.0";
-#  }
+  host s14-t32-sut1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.58;
+    filename "pxelinux.0";
+  }
+  host s15-t32-sut2 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.59;
+    filename "pxelinux.0";
+  }
+  host s16-t32-tg1 {
+    hardware ethernet 00:00:00:00:00:00;
+    fixed-address 10.30.51.60;
+    filename "pxelinux.0";
+  }
 # 3-Node Arm
 #  host s15-t33-sut1 {
 #    hardware ethernet 00:00:00:00:00:00;