openstack
/
neutron
Code Issues Proposed changes

Merge "Update install doc for ubuntu" into stable/queens

This commit is contained in:
Zuul 2018-08-02 19:06:48 +00:00 committed by Gerrit Code Review
parent 887969d918 e211cc204a
commit ea66482c5d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/install/compute-install-ubuntu.rst
View File

@ -58,7 +58,7 @@ authentication mechanism, message queue, and plug-in.
[keystone_authtoken]
# ...
auth_uri = http://controller:5000
auth_url = http://controller:35357
auth_url = http://controller:5000
memcached_servers = controller:11211
auth_type = password
project_domain_name = default
@ -107,7 +107,7 @@ Configure the Compute service to use the Networking service
[neutron]
# ...
url = http://controller:9696
auth_url = http://controller:35357
auth_url = http://controller:5000
auth_type = password
project_domain_name = default
user_domain_name = default

4
doc/source/install/controller-install-option1-ubuntu.rst
View File

@ -87,7 +87,7 @@ and plug-in.
[keystone_authtoken]
# ...
auth_uri = http://controller:5000
auth_url = http://controller:35357
auth_url = http://controller:5000
memcached_servers = controller:11211
auth_type = password
project_domain_name = default
@ -119,7 +119,7 @@ and plug-in.
[nova]
# ...
auth_url = http://controller:35357
auth_url = http://controller:5000
auth_type = password
project_domain_name = default
user_domain_name = default

4
doc/source/install/controller-install-option2-ubuntu.rst
View File

@ -86,7 +86,7 @@ Configure the server component
[keystone_authtoken]
# ...
auth_uri = http://controller:5000
auth_url = http://controller:35357
auth_url = http://controller:5000
memcached_servers = controller:11211
auth_type = password
project_domain_name = default
@ -118,7 +118,7 @@ Configure the server component
[nova]
# ...
auth_url = http://controller:35357
auth_url = http://controller:5000
auth_type = password
project_domain_name = default
user_domain_name = default

2
doc/source/install/controller-install-ubuntu.rst
View File

@ -248,7 +248,7 @@ Configure the Compute service to use the Networking service
[neutron]
# ...
url = http://controller:9696
auth_url = http://controller:35357
auth_url = http://controller:5000
auth_type = password
project_domain_name = default
user_domain_name = default