summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorKiall Mac Innes <kiall@macinnes.ie>2016-03-16 19:24:55 +0000
committerKiall Mac Innes <kiall@macinnes.ie>2016-03-17 00:14:24 +0000
commit6211b7d2e12a6feef4df73a3e92a8daf400004aa (patch)
tree427e20963cb299c632c6c4ec0320c13752c210d3 /devstack
parent6aa43088033393878be0533ab246e86c45e17915 (diff)
DevStack: Explicitly install libcap2-bin and don't fail without AA
Notes
Notes (review): Code-Review+2: Graham Hayes <graham.hayes@hpe.com> Workflow+1: Graham Hayes <graham.hayes@hpe.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 17 Mar 2016 01:26:12 +0000 Reviewed-on: https://review.openstack.org/293668 Project: openstack/designate Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/designate_plugins/backend-bind92
-rwxr-xr-xdevstack/plugin.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/devstack/designate_plugins/backend-bind9 b/devstack/designate_plugins/backend-bind9
index 1de63f9..32d628c 100644
--- a/devstack/designate_plugins/backend-bind9
+++ b/devstack/designate_plugins/backend-bind9
@@ -68,7 +68,7 @@ function install_designate_backend {
68 sudo tee /etc/apparmor.d/local/usr.sbin.named > /dev/null << EOF 68 sudo tee /etc/apparmor.d/local/usr.sbin.named > /dev/null << EOF
69$DESIGNATE_STATE_PATH/bind9/** rw, 69$DESIGNATE_STATE_PATH/bind9/** rw,
70EOF 70EOF
71 restart_service apparmor 71 restart_service apparmor || :
72 fi 72 fi
73} 73}
74 74
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 412031b..cde9c9a 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -225,6 +225,8 @@ function init_designate {
225 225
226# install_designate - Collect source and prepare 226# install_designate - Collect source and prepare
227function install_designate { 227function install_designate {
228 install_package libcap2-bin
229
228 if is_fedora; then 230 if is_fedora; then
229 # This package provides `dig` 231 # This package provides `dig`
230 install_package bind-utils 232 install_package bind-utils