openstack/devstack-plugin-container
Code Issues Proposed changes

Install apparmor tools also for Ubuntu Focal.

Browse Source 
k8s gate is still on focal, so patch which unblock the apparmor for
jammy does not affect it. Here is the fix for focal as well.

Change-Id: I2a9bc69a59e7d6d21d61e79115d5a3c726c73ab0
This commit is contained in:
Roman Dobosz 2023-02-23 17:23:05 +01:00
parent 38835f2c54
commit bdc0b49ce3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/docker
View File

@ -62,9 +62,7 @@ function install_docker {
arch=$(dpkg --print-architecture)
fi
if is_ubuntu; then
if [[ ${dist_version} == 'jammy' ]]; then
apt_get install apparmor
fi
apt_get install apparmor
if [[ ${dist_version} == 'trusty' ]]; then
if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual