diff options
| -rwxr-xr-x | devstack/plugin.sh | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index d6f9c85c..e8a635c3 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -115,14 +115,7 @@ function configure_designate { fi # Logging Configuration - if [ "$USE_SYSTEMD" != "False" ]; then - setup_systemd_logging $DESIGNATE_CONF - fi - - # Format logging - if [ "$LOG_COLOR" == "True" ] && [ "$USE_SYSTEMD" == "False" ]; then - setup_colorized_logging $DESIGNATE_CONF DEFAULT - fi + setup_systemd_logging $DESIGNATE_CONF # Backend Plugin Configuation configure_designate_backend @@ -238,10 +231,6 @@ function create_designate_pool_configuration { # init_designate - Initialize etc. function init_designate { - # Some Designate Backends require mdns be bound to port 53, make that - # doable. - sudo setcap 'cap_net_bind_service=+ep' $(readlink -f /usr/bin/python) - # (Re)create designate database recreate_database designate utf8 @@ -259,12 +248,9 @@ function install_designate { install_apache_wsgi fi - - if is_ubuntu; then - install_package libcap2-bin - elif is_fedora; then + if is_fedora; then # bind-utils package provides `dig` - install_package libcap bind-utils + install_package bind-utils fi git_clone $DESIGNATE_REPO $DESIGNATE_DIR $DESIGNATE_BRANCH |