diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml index 0a6e8d5e01..991774cf80 100644 --- a/doc/install-guide/section_glance-install.xml +++ b/doc/install-guide/section_glance-install.xml @@ -123,7 +123,9 @@ Repeat User Password: Default configuration files vary by distribution. You might need to add these sections and options rather than modifying existing - sections and options. + sections and options. Also, an ellipsis (...) in the configuration + snippets indicates potential default configuration options that you + should retain. Install the packages: @@ -151,10 +153,13 @@ connection = mysql://glance:GLANCE_DBPASS@[keystone_authtoken] ... auth_uri = http://controller:5000 -identity_uri = http://controller:35357 -admin_tenant_name = service -admin_user = glance -admin_password = GLANCE_PASS +auth_url = http://controller:35357 +auth_plugin = password +project_domain_id = default +user_domain_id = default +project_name = service +username = glance +password = GLANCE_PASS [paste_deploy] ... @@ -163,10 +168,8 @@ flavor = keystone password you chose for the glance user in the Identity service. - Comment out any auth_host, - auth_port, and - auth_protocol options because the - identity_uri option replaces them. + Comment out or remove any other options in the + [keystone_authtoken] section. @@ -188,13 +191,6 @@ notification_driver = noop The Telemetry chapter provides an Image Service configuration that enables notifications. - - In the [DEFAULT] section, configure the - log file: - [DEFAULT] -... -log_file = /var/log/glance/api.log - (Optional) To assist with troubleshooting, enable verbose logging in the [DEFAULT] @@ -225,10 +221,13 @@ connection = mysql://glance:GLANCE_DBPASS@[keystone_authtoken] ... auth_uri = http://controller:5000 -identity_uri = http://controller:35357 -admin_tenant_name = service -admin_user = glance -admin_password = GLANCE_PASS +auth_url = http://controller:35357 +auth_plugin = password +project_domain_id = default +user_domain_id = default +project_name = service +username = glance +password = GLANCE_PASS [paste_deploy] ... @@ -237,10 +236,8 @@ flavor = keystone password you chose for the glance user in the Identity service. - Comment out any auth_host, - auth_port, and - auth_protocol options because the - identity_uri option replaces them. + Comment out or remove any other options in the + [keystone_authtoken] section. @@ -254,13 +251,6 @@ notification_driver = noop The Telemetry chapter provides an Image Service configuration that enables notifications. - - In the [DEFAULT] section, configure the - log file: - [DEFAULT] -... -log_file = /var/log/glance/registry.log - (Optional) To assist with troubleshooting, enable verbose logging in the [DEFAULT]