openstack/designate
Code Issues Proposed changes

Fix integration doc that example config not formatted

Browse Source 
Change-Id: Ieaaeccb448d059a2f96d8e40d4c4d7b4033ae30c
This commit is contained in:
stanzgy 2015-12-16 15:35:16 +08:00 committed by Graham Hayes
parent eba1f9e9b4
commit 1bf7a0d5f2
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
doc/source/integrations.rst
View File

@ -32,17 +32,21 @@ Configuring Neutron
Configuring the FloatingIP feature is really simple:
[network_api:neutron]
# endpoints = RegionOne|http://localhost:9696
# endpoint_type = publicURL
# timeout = 30
# admin_username = designate
# admin_password = designate
# admin_tenant_name = designate
# auth_url = http://localhost:35357/v2.0
# insecure = False
# auth_strategy = keystone
# ca_certificates_file = /etc/path/to/ca.pem
.. code-block:: ini
[network_api:neutron]
endpoints = RegionOne|http://localhost:9696
endpoint_type = publicURL
timeout = 30
# This is optional - if these credentials are not provided designate will
# use the users context and auth token to query neutron
#admin_username = designate
#admin_password = designate
#admin_tenant_name = designate
auth_url = http://localhost:35357/v2.0
insecure = False
auth_strategy = keystone
ca_certificates_file = /etc/path/to/ca.pem
Note that using admin_user, admin_password and admin_tenant_name is optional,
if not present we'll piggyback on the context.auth_token passed in by the API.