From 46de766e513cfb97cbfc50b001734e02711517e4 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 3 Oct 2017 16:27:32 +0000 Subject: [PATCH] Dev docs cleanup A few minor issues I noticed as I was going through the development environment setup. Fixes a typo and replaces deprecated config opt references with the new ones. Change-Id: Ib094595153e9b74706304f8328de74d07649b817 --- doc/source/contributor/ubuntu-dev.rst | 2 +- doc/source/examples/basic-config-sample.conf | 22 +++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/doc/source/contributor/ubuntu-dev.rst b/doc/source/contributor/ubuntu-dev.rst index 83e0d5b2b..dfe8f3daa 100644 --- a/doc/source/contributor/ubuntu-dev.rst +++ b/doc/source/contributor/ubuntu-dev.rst @@ -92,7 +92,7 @@ Installing Designate 6. Change directories to the etc/designate folder. .. note:: - Everything from here on out should take place in or below your designate/etc folder + Everything from here on out should take place in or below your etc/designate folder :: diff --git a/doc/source/examples/basic-config-sample.conf b/doc/source/examples/basic-config-sample.conf index 94e90ceaf..4f1c864fd 100644 --- a/doc/source/examples/basic-config-sample.conf +++ b/doc/source/examples/basic-config-sample.conf @@ -8,9 +8,6 @@ debug = True # Top-level directory for maintaining designate's state. state_path = $pybasedir/state -# Driver used for issuing notifications -notification_driver = messaging - # Use "sudo designate-rootwrap /etc/designate/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the command directly @@ -20,11 +17,11 @@ notification_driver = messaging #supported_record_type = A, AAAA, CNAME, MX, SRV, TXT, SPF, NS, PTR, SSHFP, SOA # RabbitMQ Config -rabbit_userid = designate -rabbit_password = designate -#rabbit_virtual_host = / -#rabbit_use_ssl = False -#rabbit_hosts = 127.0.0.1:5672 +transport_url = rabbit://designate:designate@127.0.0.1// + +[oslo_messaging_notifications] +# Driver used for issuing notifications +driver = messaging ######################## ## Service Configuration @@ -43,11 +40,8 @@ rabbit_password = designate # API Service #----------------------- [service:api] -# Address to bind the API server -api_host = 0.0.0.0 - -# Port to bind the API server -api_port = 9001 +# API host:port pairs to listen on +listen = 0.0.0.0:9001 # Authentication strategy to use - can be either "noauth" or "keystone" auth_strategy = noauth @@ -86,7 +80,7 @@ enabled = True #poll_retry_interval = 15 #poll_max_retries = 10 #poll_delay = 5 -notify = True +#notify = True #----------------------- # Producer Service