diff options
| author | cedric.brandily <cedric.brandily@thalesgroup.com> | 2016-04-01 16:16:15 +0200 |
|---|---|---|
| committer | Cedric Brandily <zzelle@gmail.com> | 2016-04-01 16:19:45 +0200 |
| commit | 17b4b16ace24ffa3793b19cfe8ddf7d0dedb40f2 (patch) | |
| tree | f882bdca65fcdbaa9512ddd68425c58e09a2569f /heatclient/shell.py | |
| parent | 349a2c85b17be5d8f438e1b511dcbeb69f0fb7f1 (diff) | |
| download | python-heatclient-17b4b16ace24ffa3793b19cfe8ddf7d0dedb40f2.tar.gz | |
Support OS_KEY/OS_CERT environment variables
heatclient allows to provide client certificate/key using --os-key/cert
options but not using usual environment variables.
This change uses OS_KEY/OS_CERT environment variables as default values
for client certificate/key.
Closes-Bug: #1564930
Change-Id: Ie7a4dce2a9b0e498ee3b9f6cb36a8988ea3a13fc
Diffstat (limited to 'heatclient/shell.py')
| -rw-r--r-- | heatclient/shell.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/heatclient/shell.py b/heatclient/shell.py index f5ab78c..5f13b0f 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -59,6 +59,7 @@ class HeatShell(object): parser.add_argument( '--os-cert', + default=utils.env('OS_CERT'), help=_('Path of certificate file to use in SSL connection. ' 'This file can optionally be prepended with ' 'the private key.')) @@ -70,6 +71,7 @@ class HeatShell(object): {'arg': '--os-cert'}) parser.add_argument('--os-key', + default=utils.env('OS_KEY'), help=_('Path of client key to use in SSL ' 'connection. This option is not necessary ' 'if your key is prepended to your cert ' |