summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-24 17:53:40 +0000
committerGerrit Code Review <review@openstack.org>2017-10-24 17:53:40 +0000
commit6beba54a71510525d5bbc4956d20d27bffa982e5 (patch)
tree3a7ba7d24507ac4af92ce355ffb40a5d4c28e5f6
parentefaea88bf13889519b4e370f2b3082e30ca0e973 (diff)
parentbe5a66a5c181e4831e22f52a0110cc4a79cadef2 (diff)
Merge "Move default DNS driver to bind9" into stable/pike5.0.1stable/pike
-rw-r--r--contrib/vagrant/local.conf2
-rw-r--r--devstack/settings2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/vagrant/local.conf b/contrib/vagrant/local.conf
index 3b244fa..eae4c18 100644
--- a/contrib/vagrant/local.conf
+++ b/contrib/vagrant/local.conf
@@ -34,7 +34,7 @@ enable_service designate,designate-central,designate-api,designate-pool-manager,
34 34
35# Backend Driver (e.g. powerdns, bind9. See designate.backend section of 35# Backend Driver (e.g. powerdns, bind9. See designate.backend section of
36# setup.cfg) 36# setup.cfg)
37#DESIGNATE_BACKEND_DRIVER=powerdns 37#DESIGNATE_BACKEND_DRIVER=bind9
38 38
39# Agent Backend Driver (Used only when DESIGNATE_BACKEND_DRIVER=agent) 39# Agent Backend Driver (Used only when DESIGNATE_BACKEND_DRIVER=agent)
40#DESIGNATE_AGENT_BACKEND_DRIVER=fake 40#DESIGNATE_AGENT_BACKEND_DRIVER=fake
diff --git a/devstack/settings b/devstack/settings
index 58a0fa4..94fcbbf 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,5 +1,5 @@
1# Default options 1# Default options
2DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=powerdns} 2DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=bind9}
3DESIGNATE_AGENT_BACKEND_DRIVER=${DESIGNATE_AGENT_BACKEND_DRIVER:-"fake"} 3DESIGNATE_AGENT_BACKEND_DRIVER=${DESIGNATE_AGENT_BACKEND_DRIVER:-"fake"}
4DESIGNATE_POOL_MANAGER_CACHE_DRIVER=${DESIGNATE_POOL_MANAGER_CACHE_DRIVER:-memcache} 4DESIGNATE_POOL_MANAGER_CACHE_DRIVER=${DESIGNATE_POOL_MANAGER_CACHE_DRIVER:-memcache}
5DESIGNATE_POOL_ID=${DESIGNATE_POOL_ID:-794ccc2c-d751-44fe-b57f-8894c9f5c842} 5DESIGNATE_POOL_ID=${DESIGNATE_POOL_ID:-794ccc2c-d751-44fe-b57f-8894c9f5c842}