diff --git a/barbican/values_overrides/apparmor.yaml b/barbican/values_overrides/apparmor.yaml index 639db5dac4..7e24c5ce45 100644 --- a/barbican/values_overrides/apparmor.yaml +++ b/barbican/values_overrides/apparmor.yaml @@ -1,6 +1,5 @@ -# NOTE: Enable this with the correct policy -#pod: -# mandatory_access_control: -# type: apparmor -# barbican-api: -# barbican-api: localhost/docker-default +pod: + mandatory_access_control: + type: apparmor + barbican-api: + barbican-api: runtime/default diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml index c17b7d8171..0d96646bb0 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -283,8 +283,7 @@ - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/developer/nfs/160-compute-kit.sh - # NOTE: Re-enable barbican once the profile gets sorted out - #- ./tools/deployment/component/barbican/barbican.sh + - ./tools/deployment/component/barbican/barbican.sh - ./tools/deployment/developer/common/170-setup-gateway.sh - ./tools/deployment/developer/common/900-use-it.sh