diff options
| author | Stefano Zilli <stefano.zilli@cern.ch> | 2013-09-13 09:08:19 +0200 |
|---|---|---|
| committer | Stefano Zilli <stefano.zilli@cern.ch> | 2013-10-01 08:34:04 +0200 |
| commit | 544e6217e58a9eaee67e98f27cb9385ee412ba79 (patch) | |
| tree | 355e8428b2b2ab978584e09c41a4e337164ec876 /ceilometerclient/shell.py | |
| parent | b961738765976e77711d909eec1ecc402fa8a484 (diff) | |
| download | python-ceilometerclient-544e6217e58a9eaee67e98f27cb9385ee412ba79.tar.gz | |
Added support to --os-cacert
Closes-Bug: #1224343
Change-Id: Ib0549d4496c47900c81cc970b99bcff25cad0040
Diffstat (limited to 'ceilometerclient/shell.py')
| -rw-r--r-- | ceilometerclient/shell.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 3ea531a..b6d3939 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -76,11 +76,17 @@ class CeilometerShell(object): ' This option is not necessary if your key is ' 'prepended to your cert file.') - parser.add_argument('--ca-file', - help='Path of CA SSL certificate(s) used to verify' - ' the remote server certificate. Without this ' + parser.add_argument('--os-cacert', + metavar='<ca-certificate-file>', + dest='os_cacert', + default=utils.env('OS_CACERT'), + help='Path of CA TLS certificate(s) used to verify' + 'the remote server\'s certificate. Without this ' 'option ceilometer looks for the default system ' 'CA certificates.') + parser.add_argument('--ca-file', + dest='os_cacert', + help='DEPRECATED! Use --os-cacert.') parser.add_argument('--timeout', default=600, |