Merge "Revert "Add lxc3 compatibility"" into stable/rocky

ansible-role-requirements.yml

@@ -33,7 +33,7 @@
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: ecc66e996d0ab9ee2fb5ba5ef79a03d444748d61
+  version: 6e0ada93907aacf4d909bc6a30be1383986e4708
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts

inventory/group_vars/all/lxc.yml

@@ -1,17 +0,0 @@
----
-# Copyright 2018, BBC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# The apparmor profile lxc config key changes between LXC version 2 and 3
-lxc_config_key_apparmor: "{{ lookup('pipe', 'lxc-info --version 2>/dev/null || echo 2.0.0') is version_compare('3.0.0', 'lt') | ternary('aa_profile', 'apparmor.profile') }}"

inventory/group_vars/all_containers.yml

@@ -16,7 +16,7 @@
 # This is the default LXC AppArmor profile
 # Groups which need the unbound profile have a specific override
 lxc_container_config_list:
-  - "lxc.{{ lxc_config_key_apparmor }}=lxc-openstack"
+  - "lxc.aa_profile=lxc-openstack"
 
 # Needed by playbooks/common-tasks/os-lxc-container-setup.yml
 lxc_container_log_path: "/var/log/lxc"

inventory/group_vars/cinder_volume.yml

@@ -19,4 +19,4 @@
 cinder_backend_rbd_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.rbd.RBDDriver") != -1 }}'
 
 lxc_container_config_list:
-  - "lxc.{{ lxc_config_key_apparmor }}=unconfined"
+  - "lxc.aa_profile=unconfined"

inventory/group_vars/neutron_agent.yml

@@ -22,7 +22,7 @@ neutron_dhcp_config:
   log-facility: "/var/log/neutron/neutron-dnsmasq.log"
 
 lxc_container_config_list:
-  - "lxc.{{ lxc_config_key_apparmor }}=unconfined"
+  - "lxc.aa_profile=unconfined"
 
 # Ensure that all neutron agent containers get a fixed mac address
 lxc_container_fixed_mac: true