diff options
| author | Tovin Seven <vinhnt@vn.fujitsu.com> | 2017-06-19 10:13:07 +0700 |
|---|---|---|
| committer | Tovin Seven <vinhnt@vn.fujitsu.com> | 2017-07-24 13:30:29 +0700 |
| commit | c0f88d5fc0fd947319e022cfeba21bcb15635316 (patch) | |
| tree | 951c0519930c42acc5e4b8d0ae3ea51d79242d58 | |
| parent | a6e0cdf46d5fad2c6eb65d828af6734681d10cc1 (diff) | |
| download | python-glanceclient-c0f88d5fc0fd947319e022cfeba21bcb15635316.tar.gz | |
Make --profile load from environment variables
--profile argument can be loaded from OS_PROFILE environment variables
to avoid repeating --profile in client commands.
Correct/update help text.
Co-Authored-By: Hieu LE <hieulq@vn.fujitsu.com>
Change-Id: I67c1e4b859b972e380eb658c98ceae4fbef5c254
| -rw-r--r-- | doc/source/cli/details.rst | 8 | ||||
| -rw-r--r-- | glanceclient/shell.py | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/source/cli/details.rst b/doc/source/cli/details.rst index f303c09..efc2a33 100644 --- a/doc/source/cli/details.rst +++ b/doc/source/cli/details.rst @@ -100,11 +100,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. diff --git a/glanceclient/shell.py b/glanceclient/shell.py index 5aaaf39..fae9e4a 100644 --- a/glanceclient/shell.py +++ b/glanceclient/shell.py @@ -192,16 +192,18 @@ class OpenStackImagesShell(object): if osprofiler_profiler: parser.add_argument('--profile', metavar='HMAC_KEY', + default=utils.env('OS_PROFILE'), help='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 ' + 'glance, it is specified in glance ' 'configuration file at ' - '/etc/glance/api-paste.ini and ' - '/etc/glance/registry-paste.ini. Without key ' - 'the profiling will not be triggered even ' - 'if osprofiler is enabled on server side.') + '/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. ' + 'Defaults to env[OS_PROFILE].') self._append_global_identity_args(parser, argv) |