diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-07-13 07:33:16 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-07-13 07:33:16 +0000 |
| commit | cfd0d32435a912fccf39aac04959bd0d13a8d0e8 (patch) | |
| tree | 46f73c26e219f9ba44453b176d10dd464e2c2f00 /resources/tools/testbed-setup/ansible | |
| parent | 9d0b5662154d7a00f9db4b26728ba97cbe4ae131 (diff) | |
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 <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible')
3 files changed, 5 insertions, 5 deletions
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 |