diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-25 10:47:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-25 10:47:55 +0000 |
| commit | 1f0eaa23ba556a9af5abd7f394374dd81d657d3d (patch) | |
| tree | 2321fd3f7bc6605894ce6e1ea59ce5e50a91a72f | |
| parent | f7e23802cd82f4750848bc4c0d04cf4ec2e1cdf5 (diff) | |
| parent | e4f74e2b9af17f63e5633a49815f0228450ca59a (diff) | |
| download | ironic-1f0eaa23ba556a9af5abd7f394374dd81d657d3d.tar.gz | |
Merge "Update auth_uri option to www_authenticate_uri" into stable/queens
| -rw-r--r-- | doc/source/admin/report.txt | 2 | ||||
| -rw-r--r-- | doc/source/install/include/configure-ironic-api.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/admin/report.txt b/doc/source/admin/report.txt index 9100e573b..c63ad6373 100644 --- a/doc/source/admin/report.txt +++ b/doc/source/admin/report.txt @@ -457,7 +457,7 @@ keystone_authtoken: auth_protocol = https auth_section = None auth_type = password - auth_uri = http://10.223.197.220/identity + www_authenticate_uri = http://10.223.197.220/identity auth_version = None cache = None cafile = /opt/stack/data/ca-bundle.pem diff --git a/doc/source/install/include/configure-ironic-api.inc b/doc/source/install/include/configure-ironic-api.inc index 09c75a3bc..10249a055 100644 --- a/doc/source/install/include/configure-ironic-api.inc +++ b/doc/source/install/include/configure-ironic-api.inc @@ -51,7 +51,7 @@ Configuring ironic-api service auth_type=password # Complete public Identity API endpoint (string value) - auth_uri=http://PUBLIC_IDENTITY_IP:5000 + www_authenticate_uri=http://PUBLIC_IDENTITY_IP:5000 # Complete admin Identity API endpoint. (string value) auth_url=http://PRIVATE_IDENTITY_IP:35357 |