From cfd0d32435a912fccf39aac04959bd0d13a8d0e8 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 13 Jul 2018 07:33:16 +0000 Subject: Update skylake tesbed inventory - Add missing topology files - Add missing topologies to bootstrap - Small fixes in ansible Change-Id: I3b9ad60a0adfae9e93e5e700279f7ade81174471 Signed-off-by: Peter Mikus --- .../ansible/roles/tg_sut/defaults/main.yaml | 4 +-- .../ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml | 2 +- resources/tools/testbed-setup/ansible/site.yaml | 4 +-- resources/tools/testbed-setup/pxe/dhcpd.conf | 40 +++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'resources/tools/testbed-setup') diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml index cefc496107..174dc78cb0 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml @@ -23,8 +23,8 @@ docker_apt_package_name: "{{ docker_version }}~{{ docker_edition }}~3-0~{{ ansib apt_cache_time: 86400 kubernetes_channel: "main" -kubernetes_version: "1.10.3" +kubernetes_version: "1.11.0-00" kubernetes_apt_key: "54A647F9048D5688D7DA2ABE6A030B21BA07F4FB" kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}" -kubernetes_apt_package_name: "{{ kubernetes_version }}-00" +kubernetes_apt_package_name: "{{ kubernetes_version }}" diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml index f43fad1326..b416f9f7de 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml @@ -124,7 +124,7 @@ command: "systemctl daemon-reload" notify: ["Restart Docker"] when: (docker_register_systemd_service and - docker_register_systemd_service | changed) + docker_register_systemd_service is changed) tags: restart-docker - name: Set specific users to "docker" group diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml index 834ad51787..4a8a7f045a 100644 --- a/resources/tools/testbed-setup/ansible/site.yaml +++ b/resources/tools/testbed-setup/ansible/site.yaml @@ -7,8 +7,8 @@ - import_playbook: sut.yaml tags: sut -- import_playbook: vppdevice.yaml - tags: vppdevice +#- import_playbook: vppdevice.yaml +# tags: vppdevice #- import_playbook: virl.yaml # tags: virl diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf index 17c0bbccb1..00b5ed1ca0 100644 --- a/resources/tools/testbed-setup/pxe/dhcpd.conf +++ b/resources/tools/testbed-setup/pxe/dhcpd.conf @@ -155,21 +155,21 @@ subnet 10.30.51.0 netmask 255.255.255.0 { fixed-address 10.30.51.48; 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"; -# } + host s14-t32-sut1 { + hardware ethernet ac:1f:6b:8b:53:64; + fixed-address 10.30.51.58; + filename "pxelinux.0"; + } + host s15-t32-sut2 { + hardware ethernet ac:1f:6b:8b:56:e2; + fixed-address 10.30.51.59; + filename "pxelinux.0"; + } + host s16-t32-tg1 { + hardware ethernet ac:1f:6b:8b:55:ae; + fixed-address 10.30.51.60; + filename "pxelinux.0"; + } # 3-Node Arm # host s15-t33-sut1 { # hardware ethernet 00:00:00:00:00:00; @@ -181,11 +181,11 @@ subnet 10.30.51.0 netmask 255.255.255.0 { # fixed-address 10.30.51.37; # filename "ubuntu-installer/arm64/bootnetaa64.efi"; # } -# host s19-t33t34-tg1 { -# hardware ethernet 00:00:00:00:00:00; -# fixed-address 10.30.51.49; -# filename "pxelinux.0"; -# } + host s19-t33t34-tg1 { + hardware ethernet ac:1f:6b:8b:53:60; + fixed-address 10.30.51.49; + filename "pxelinux.0"; + } # host s18-t34-sut1 { # hardware ethernet 00:00:00:00:00:00; # fixed-address 10.30.51.41; -- cgit 1.2.3-korg