diff options
| author | Kiall Mac Innes <kiall@macinnes.ie> | 2016-03-16 19:24:55 +0000 |
|---|---|---|
| committer | Graham Hayes <graham.hayes@hpe.com> | 2016-03-18 13:41:47 +0000 |
| commit | 35e1b35b17461a960ef22b6510f8ba2f6389b01a (patch) | |
| tree | 9096abd1df3f44f9bac26213ed10ca5978fe1a3c | |
| parent | 6c49166b065078e6ed50cbdd9a0afb44b3054474 (diff) | |
| download | designate-35e1b35b17461a960ef22b6510f8ba2f6389b01a.tar.gz | |
DevStack: Explicitly install libcap2-bin and don't fail without AA1.0.2
Change-Id: I2806041fc798f17c49671143cfa63ac3780a1450
| -rw-r--r-- | contrib/devstack/lib/designate | 2 | ||||
| -rw-r--r-- | contrib/devstack/lib/designate_plugins/backend-bind9 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate index 76d5a832..20811f23 100644 --- a/contrib/devstack/lib/designate +++ b/contrib/devstack/lib/designate @@ -290,6 +290,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 diff --git a/contrib/devstack/lib/designate_plugins/backend-bind9 b/contrib/devstack/lib/designate_plugins/backend-bind9 index c7382f43..ffd09322 100644 --- a/contrib/devstack/lib/designate_plugins/backend-bind9 +++ b/contrib/devstack/lib/designate_plugins/backend-bind9 @@ -69,7 +69,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 } |