From 6211b7d2e12a6feef4df73a3e92a8daf400004aa Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@macinnes.ie>
Date: Wed, 16 Mar 2016 19:24:55 +0000
Subject: [PATCH] DevStack: Explicitly install libcap2-bin and don't fail
 without AA

Change-Id: I2806041fc798f17c49671143cfa63ac3780a1450
---
 devstack/designate_plugins/backend-bind9 | 2 +-
 devstack/plugin.sh                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devstack/designate_plugins/backend-bind9 b/devstack/designate_plugins/backend-bind9
index 1de63f936..32d628c54 100644
--- a/devstack/designate_plugins/backend-bind9
+++ b/devstack/designate_plugins/backend-bind9
@@ -68,7 +68,7 @@ function install_designate_backend {
         sudo tee /etc/apparmor.d/local/usr.sbin.named > /dev/null << EOF
 $DESIGNATE_STATE_PATH/bind9/** rw,
 EOF
-        restart_service apparmor
+        restart_service apparmor || :
     fi
 }
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 412031bc3..cde9c9a75 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -225,6 +225,8 @@ function init_designate {
 
 # install_designate - Collect source and prepare
 function install_designate {
+    install_package libcap2-bin
+
     if is_fedora; then
         # This package provides `dig`
         install_package bind-utils