diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-24 17:53:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-24 17:53:40 +0000 |
| commit | 6beba54a71510525d5bbc4956d20d27bffa982e5 (patch) | |
| tree | 3a7ba7d24507ac4af92ce355ffb40a5d4c28e5f6 | |
| parent | efaea88bf13889519b4e370f2b3082e30ca0e973 (diff) | |
| parent | be5a66a5c181e4831e22f52a0110cc4a79cadef2 (diff) | |
| download | designate-6beba54a71510525d5bbc4956d20d27bffa982e5.tar.gz | |
Merge "Move default DNS driver to bind9" into stable/pike5.0.1
| -rw-r--r-- | contrib/vagrant/local.conf | 2 | ||||
| -rw-r--r-- | devstack/settings | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/vagrant/local.conf b/contrib/vagrant/local.conf index 3b244fa5..eae4c183 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, # Backend Driver (e.g. powerdns, bind9. See designate.backend section of # setup.cfg) -#DESIGNATE_BACKEND_DRIVER=powerdns +#DESIGNATE_BACKEND_DRIVER=bind9 # Agent Backend Driver (Used only when DESIGNATE_BACKEND_DRIVER=agent) #DESIGNATE_AGENT_BACKEND_DRIVER=fake diff --git a/devstack/settings b/devstack/settings index 58a0fa48..94fcbbf5 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,5 +1,5 @@ # Default options -DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=powerdns} +DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=bind9} DESIGNATE_AGENT_BACKEND_DRIVER=${DESIGNATE_AGENT_BACKEND_DRIVER:-"fake"} DESIGNATE_POOL_MANAGER_CACHE_DRIVER=${DESIGNATE_POOL_MANAGER_CACHE_DRIVER:-memcache} DESIGNATE_POOL_ID=${DESIGNATE_POOL_ID:-794ccc2c-d751-44fe-b57f-8894c9f5c842} |