Repository: libcloud Updated Branches: refs/heads/trunk 819f1671f -> 0a08bc6e1
Allow user to force auth version by passing "ex_force_auth_version" kwarg to OpenStack based driver constructor even if "_auth_version" class attribute is set. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7c967486 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7c967486 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7c967486 Branch: refs/heads/trunk Commit: 7c9674863a0aaf3a52895505b4b38c892042d9de Parents: 819f167 Author: Tomaz Muraus <[email protected]> Authored: Wed May 21 14:00:38 2014 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Wed May 21 14:00:38 2014 +0200 ---------------------------------------------------------------------- libcloud/common/openstack.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c967486/libcloud/common/openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/common/openstack.py b/libcloud/common/openstack.py index 158a9f5..26bf692 100644 --- a/libcloud/common/openstack.py +++ b/libcloud/common/openstack.py @@ -487,9 +487,11 @@ class OpenStackBaseConnection(ConnectionUserAndKey): super(OpenStackBaseConnection, self).__init__( user_id, key, secure=secure, timeout=timeout) + if ex_force_auth_version: + self._auth_version = ex_force_auth_version + self._ex_force_base_url = ex_force_base_url self._ex_force_auth_url = ex_force_auth_url - self._auth_version = self._auth_version or ex_force_auth_version self._ex_force_auth_token = ex_force_auth_token self._ex_tenant_name = ex_tenant_name self._ex_force_service_type = ex_force_service_type
