From 1b4d4212c83367d5e2918aa3a63355821ba5d3ea Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Sun, 29 Jul 2018 16:07:44 +0100 Subject: [PATCH] Add lxc3 compatibility to tests lxc3 deprecates many legacy config keys [1]. [1] https://discuss.linuxcontainers.org/t/lxc-2-1-has-been-released/487 Change-Id: I7b19b483f32ba46cbc87a8586ae092e96f067090 --- tests/group_vars/all_containers.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index 6ddb0b33..cd06d751 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -27,5 +27,10 @@ properties: # NOTE(cloudnull): The lxc-openstack AA profile for is used to ensure general # container functionality typical to the integrated build. -lxc_container_config_list: - - "lxc.aa_profile=lxc-openstack" +lxc2_container_config_list: + - 'lxc.aa_profile=lxc-openstack' + +lxc3_container_config_list: + - 'lxc.apparmor.profile=lxc-openstack' + +lxc_container_config_list: "{{ lookup('pipe', 'lxc-info --version || echo 2.0.0') is version_compare('3.0.0', 'lt') | ternary(lxc2_container_config_list, lxc3_container_config_list) }}"