diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 03:38:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 03:38:44 +0000 |
| commit | bb0b59bda131c9f1a65ffe99d95822fc29c5e59d (patch) | |
| tree | c35742bb1a13c16d22257da05e2e38d5f7168537 | |
| parent | 158f7ccd743b9fee12d60b10cf0fe696d5d4ed34 (diff) | |
| parent | bb282936a01221821988d51a3896907f8c3404ff (diff) | |
| download | python-glanceclient-bb0b59bda131c9f1a65ffe99d95822fc29c5e59d.tar.gz | |
Merge "Honor '--insecure' commandline flag also for keystone authentication"
| -rw-r--r-- | glanceclient/shell.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glanceclient/shell.py b/glanceclient/shell.py index fe7a285..043d501 100644 --- a/glanceclient/shell.py +++ b/glanceclient/shell.py @@ -206,7 +206,8 @@ class OpenStackImagesShell(object): password=kwargs.get('password'), tenant_id=kwargs.get('tenant_id'), tenant_name=kwargs.get('tenant_name'), - auth_url=kwargs.get('auth_url')) + auth_url=kwargs.get('auth_url'), + insecure=kwargs.get('insecure')) service_type = kwargs.get('service_type') or 'image' endpoint_type = kwargs.get('endpoint_type') or 'publicURL' endpoint = _ksclient.service_catalog.url_for( @@ -272,7 +273,8 @@ class OpenStackImagesShell(object): 'tenant_name': args.os_tenant_name, 'auth_url': args.os_auth_url, 'service_type': args.os_service_type, - 'endpoint_type': args.os_endpoint_type + 'endpoint_type': args.os_endpoint_type, + 'insecure': args.insecure } endpoint, token = self._authenticate(**kwargs) |