summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-26 04:33:49 +0000
committerGerrit Code Review <review@openstack.org>2017-07-26 04:33:49 +0000
commitca9ae01841bbf2d8fb69802882d1811f404c080d (patch)
tree66a1cd5bdb4cb717f954734f465498b3c4706fe2 /doc
parentf455cb1939ebdef90da905b40710c8f85a8a3d12 (diff)
parentc0f88d5fc0fd947319e022cfeba21bcb15635316 (diff)
downloadpython-glanceclient-ca9ae01841bbf2d8fb69802882d1811f404c080d.tar.gz
Merge "Make --profile load from environment variables"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/cli/details.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/cli/details.rst b/doc/source/cli/details.rst
index 400c1ed..4c2dc26 100644
--- a/doc/source/cli/details.rst
+++ b/doc/source/cli/details.rst
@@ -95,11 +95,11 @@ glance optional arguments
HMAC key to use for encrypting context data for
performance profiling of operation. This key should be
the value of HMAC key configured in osprofiler
- middleware in glance, it is specified in paste
- configuration file at /etc/glance/api-paste.ini and
- /etc/glance/registry-paste.ini. Without key the
+ middleware in glance, it is specified in glance
+ configuration file at /etc/glance/glance-api.conf and
+ /etc/glance/glance-registry.conf. Without key the
profiling will not be triggered even if osprofiler is
- enabled on server side.
+ enabled on server side. Defaults to ``env[OS_PROFILE]``.
``--key-file OS_KEY``
**DEPRECATED!** Use --os-key.