From 5d4c299d02072fd18ef175bfbf7c694e94db79a6 Mon Sep 17 00:00:00 2001 From: Maros Mullner Date: Fri, 22 May 2020 08:27:07 +0200 Subject: Terraform and ansible changes for Cloud environment (AWS, Azure). Signed-off-by: Maros Mullner Change-Id: Ic78b5dae22b67763b99c50a5f15d7dd16152d5d5 --- .../tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml | 4 +++- .../tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/roles/calibration') diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml index 5be9fa93a5..c639f11088 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml @@ -19,12 +19,14 @@ packages_by_arch: - [] # Kernel version to check. -kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_machine] | join(' ') }}" +kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_machine] }}" kernel_version_by_distro_by_arch: ubuntu: x86_64: - "4.15.0-72-generic" + - "5.3.0-1020-azure" + - "5.3.0-1017-aws" aarch64: - "4.15.0-54-generic" diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml index 02a9ef3d00..e88c39c180 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml @@ -24,7 +24,7 @@ register: current_kernel_version changed_when: false failed_when: | - kernel_version not in current_kernel_version.stdout + current_kernel_version.stdout not in kernel_version tags: - check-kernel-version -- cgit 1.2.3-korg