saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Allow passing in auth_version, defaulting to 2."

Browse source 
This reverts commit 31ff2abd03.
This commit is contained in:
Ethan Erchinger 2015-10-16 18:58:42 +00:00 • committed by rallytime
parent 63d5675d34
commit 76a0d4937b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/openstack/swift.py
View file

@ -70,6 +70,7 @@ class SaltSwift(object):
tenant_name,
auth_url,
password=None,
auth_version=2,
**kwargs
):
'''
@ -84,10 +85,9 @@ class SaltSwift(object):
self.kwargs['password'] = password
self.kwargs['tenant_name'] = tenant_name
self.kwargs['authurl'] = auth_url
self.kwargs['auth_version'] = auth_version
if 'key' not in self.kwargs:
self.kwargs['key'] = password
if 'auth_version' not in self.kwargs:
self.kwargs['auth_version'] = 2
self.kwargs = _sanitize(self.kwargs)