From 34fe2eca58e8c5c9453d790c0f0dab3a05d117d3 Mon Sep 17 00:00:00 2001 From: Clenimar Filemon Date: Thu, 24 Mar 2016 15:22:57 -0300 Subject: [PATCH] Update config samples to show Identity v3 params As Designate requests its service token using Identity v3, the config.sample and some docs should reflect this. This patch updates these files in order to conform to new v3 parameters. Change-Id: I3205751f0c818f85ffe2fbb2468c6c48fd27eb91 --- doc/source/functional-tests.rst | 2 +- etc/designate/designate.conf.sample | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/source/functional-tests.rst b/doc/source/functional-tests.rst index d5bf35aa9..07b4e4161 100644 --- a/doc/source/functional-tests.rst +++ b/doc/source/functional-tests.rst @@ -45,7 +45,7 @@ The config file should look like the following: # Replace these with values that represent your identity configuration uri = http://localhost:5000/v2.0 uri_v3 = http://localhost:5000/v3 - auth_version = v2 + auth_version = 3 region = RegionOne username = demo diff --git a/etc/designate/designate.conf.sample b/etc/designate/designate.conf.sample index 5bbded3ba..0312f39b3 100644 --- a/etc/designate/designate.conf.sample +++ b/etc/designate/designate.conf.sample @@ -160,11 +160,15 @@ debug = False [keystone_authtoken] #auth_host = 127.0.0.1 #auth_port = 35357 +#auth_version = 3 #auth_protocol = http -#admin_tenant_name = service -#admin_user = designate -#admin_password = designate +#project_name = service +#username = designate +#password = designate +#project_domain_id = default +#user_domain_id = default #memcached_servers = localhost:11211 +#auth_type = password #----------------------- # CORS Middleware