Enable Docker default AppArmor profile to barbican

This adds default Apparmor profile to barbican Change-Id: Ieb3465fa0caa99fb9b1906c0173e35cd936fc4d4
2020-02-17 12:01:04 -06:00 · 2020-02-17 12:01:04 -06:00 · 3e3b9436b7
commit 3e3b9436b7
parent 1d0dcc385f
2 changed files with 6 additions and 8 deletions
--- 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
--- 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