openstack/python-keystoneclient
Code Issues Proposed changes

Change underscores in new cert options to dashes

Browse Source 
* --os_cacert -> --os-cacert
* --os_cert   -> --os-cert
* --os_key    -> --os-key

* OS_CA_CERT didn't match --os-cacert, change to OS_CACERT

Fixes bug 1040162

Change-Id: Ib03ff492b6ab2b76e54974e5436a444725615ea6
This commit is contained in:
Dean Troyer
2012-08-22 11:41:11 -05:00
parent dec8f77c92
commit d7af8598ae
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/shell.rst
View File

@@ -42,7 +42,7 @@ options, it is easier to just set them as environment variables:
The OpenStack Identity API version. The OpenStack Identity API version.
.. envvar:: OS_CA_CERT .. envvar:: OS_CACERT
The location for the CA truststore (PEM formatted) for this client. The location for the CA truststore (PEM formatted) for this client.
@@ -65,7 +65,7 @@ For example, in Bash you'd use::
export OS_TENANT_NAME=myproject export OS_TENANT_NAME=myproject
export OS_AUTH_URL=http(s)://example.com:5000/v2.0/ export OS_AUTH_URL=http(s)://example.com:5000/v2.0/
export OS_IDENTITY_API_VERSION=2.0 export OS_IDENTITY_API_VERSION=2.0
export OS_CA_CERT=/etc/keystone/yourca.pem export OS_CACERT=/etc/keystone/yourca.pem
export OS_CERT=/etc/keystone/yourpublickey.pem export OS_CERT=/etc/keystone/yourpublickey.pem
export OS_KEY=/etc/keystone/yourprivatekey.pem export OS_KEY=/etc/keystone/yourprivatekey.pem

17
keystoneclient/shell.py
View File

@@ -128,17 +128,26 @@ class OpenStackIdentityShell(object):
default=env('SERVICE_ENDPOINT'), default=env('SERVICE_ENDPOINT'),
help='Defaults to env[SERVICE_ENDPOINT]') help='Defaults to env[SERVICE_ENDPOINT]')
parser.add_argument('--os_cacert', metavar='<ca-certificate>', parser.add_argument('--os-cacert',
metavar='<ca-certificate>',
default=env('OS_CA_CERT'), default=env('OS_CA_CERT'),
help='Defaults to env[OS_CA_CERT]') help='Defaults to env[OS_CACERT]')
parser.add_argument('--os_cacert',
help=argparse.SUPPRESS)
parser.add_argument('--os_cert', metavar='<certificate>', parser.add_argument('--os-cert',
metavar='<certificate>',
default=env('OS_CERT'), default=env('OS_CERT'),
help='Defaults to env[OS_CERT]') help='Defaults to env[OS_CERT]')
parser.add_argument('--os_cert',
help=argparse.SUPPRESS)
parser.add_argument('--os_key', metavar='<key>', parser.add_argument('--os-key',
metavar='<key>',
default=env('OS_KEY'), default=env('OS_KEY'),
help='Defaults to env[OS_KEY]') help='Defaults to env[OS_KEY]')
parser.add_argument('--os_key',
help=argparse.SUPPRESS)
parser.add_argument('--insecure', parser.add_argument('--insecure',
default=False, default=False,