From 6a8f3b9b0db0965803ad230e0bf746b3fd268eec Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Mon, 6 Nov 2017 16:56:01 +0000 Subject: [PATCH] Add dns-integration setup to devstack plugin This will be used in a job that will run neutron designate integration tests from the neutron-tempest-plugin repo. Change-Id: Ib380d8a98e991a475b20140f5c37e3747aa5fc0c Needed-By: I9c2eadf1dc86cb60190fb22393a02ffa02770620 --- devstack/lib/dns | 5 +++++ devstack/plugin.sh | 3 +++ 2 files changed, 8 insertions(+) diff --git a/devstack/lib/dns b/devstack/lib/dns index 8177a8c900b..97fa01ee387 100644 --- a/devstack/lib/dns +++ b/devstack/lib/dns @@ -1,6 +1,11 @@ function configure_dns_extension { neutron_ml2_extension_driver_add "dns_domain_ports" } +function configure_dns_integration { + iniset $NEUTRON_CONF DEFAULT external_dns_driver designate + iniset $NEUTRON_CONF designate url "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/v2" + configure_auth_token_middleware $NEUTRON_CONF designate $NEUTRON_AUTH_CACHE_DIR designate +} function post_config_dns_extension { iniset $NEUTRON_CONF DEFAULT dns_domain openstackgate.local } diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 7fb145c75f6..3d6452ffc72 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -39,6 +39,9 @@ if [[ "$1" == "stack" ]]; then if is_service_enabled q-dns neutron-dns; then configure_dns_extension post_config_dns_extension + if is_service_enabled designate; then + configure_dns_integration + fi fi if is_service_enabled neutron-segments; then configure_segments_extension