aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-06-15 12:29:07 +0000
committerPeter Mikus <pmikus@cisco.com>2018-06-15 12:30:32 +0000
commit3b58a787dd0f453b3e541ff3e7b4ed602ee2ffed (patch)
tree9ab516fe3ba1e3ff9748c79c84bb765743f0964f
parentd397a241e86304852f594f1d9d439c3aa4ebdd87 (diff)
Update Ansible with new Skylake machines
Change-Id: Ia5d0b680deaf7da60696bf2d0260cf7fbea78322 Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/production23
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/site.yaml3
-rw-r--r--resources/tools/testbed-setup/ansible/vppdevice.yaml10
-rw-r--r--resources/tools/testbed-setup/pxe/dhcpd.conf100
21 files changed, 131 insertions, 61 deletions
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 4a3df38b9f..e79304fd45 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
@@ -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 77e69b39d3..1c3c83f1e2 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
@@ -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 e63e1a1c7e..b401af4683 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
@@ -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 d3f198ae8e..78a4619fdd 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
@@ -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 2ec7289aed..153904582b 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
@@ -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
index 0000000000..964dfd2344
--- /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
index 0000000000..041cb574e3
--- /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
index 0000000000..3e4010445f
--- /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
index 0000000000..7de97b5ae5
--- /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
index 0000000000..fd1314d8fc
--- /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
index 0000000000..93a86f3bd4
--- /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
index 0000000000..6c0906317c
--- /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
index 0000000000..dfacea836b
--- /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
index 0000000000..cab744a12c
--- /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
index 0000000000..867e955423
--- /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
index 0000000000..0b591cfc4b
--- /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 ee25c46326..e1703afbcc 100644
--- a/resources/tools/testbed-setup/ansible/production
+++ b/resources/tools/testbed-setup/ansible/production
@@ -24,14 +24,27 @@ all:
children:
tg:
hosts:
- 10.30.51.45: null #s2-t21-tg1
- 10.30.51.48: null #s11-t31-tg1
+ 10.30.51.45: null #s4-t21-tg1
+ 10.30.51.48: null #s13-t31-tg1
10.30.51.49: null #s17-t33-tg1
+ 10.30.51.53: null #s6-t22-tg1
+ 10.30.51.55: null #s8-t23-tg1
+ 10.30.51.57: null #s10-t24-tg1
+ 10.30.51.60: null #s16-t32-tg1
sut:
hosts:
- 10.30.51.44: null #s1-t21-sut1
- 10.30.51.46: null #s9-t31-sut1
- 10.30.51.47: null #s10-t31-sut2
+ 10.30.51.44: null #s3-t21-sut1
+ 10.30.51.46: null #s11-t31-sut1
+ 10.30.51.47: null #s12-t31-sut2
+ 10.30.51.52: null #s5-t22-sut1
+ 10.30.51.54: null #s7-t23-sut1
+ 10.30.51.56: null #s9-t24-sut1
+ 10.30.51.58: null #s14-t32-sut1
+ 10.30.51.59: null #s15-t32-sut2
+ vppdevice:
+ hosts:
+ 10.30.51.50: null #s1-t11-sut1
+ 10.30.51.51: null #s2-t12-sut1
# arm:
# children:
# tg:
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 c8454f58c6..cacae7507b 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
@@ -52,7 +52,7 @@
path: '/etc/default/grub'
state: 'present'
regexp: '^GRUB_CMDLINE_LINUX='
- line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} intel_pstate=disable"'
+ line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable"'
notify: ['Update GRUB']
tags: set-grub
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index b48ce0fa63..45808e53b0 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -7,5 +7,8 @@
- import_playbook: sut.yaml
tags: sut
+- import_playbook: vppdevice.yaml
+ tags: vppdevice
+
- import_playbook: virl.yaml
tags: virl
diff --git a/resources/tools/testbed-setup/ansible/vppdevice.yaml b/resources/tools/testbed-setup/ansible/vppdevice.yaml
new file mode 100644
index 0000000000..03e61d3cb9
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/vppdevice.yaml
@@ -0,0 +1,10 @@
+---
+# file: vppdevice.yaml
+
+- hosts: vppdevice
+ remote_user: testuser
+ become: yes
+ become_user: root
+ roles:
+ - common
+ - vppdevice
diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf
index 17b0ad7ac8..b22aff7dd8 100644
--- 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;