openstack/python-keystoneclient
Code Issues Proposed changes

Use os.path to find ~/keystone-signing (bug 1078947)

Browse Source 
Change-Id: Ie816d34299c92ba7d5cf6acf717ccfbf029f724f
This commit is contained in:
Dolph Mathews
2012-12-13 12:00:59 -06:00
parent 9a4b77b04e
commit e9ec399e66
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/middleware/auth_token.py
View File

@@ -167,7 +167,8 @@ opts = [
cfg.StrOpt('cache', default=None), # env key for the swift cache cfg.StrOpt('cache', default=None), # env key for the swift cache
cfg.StrOpt('certfile'), cfg.StrOpt('certfile'),
cfg.StrOpt('keyfile'), cfg.StrOpt('keyfile'),
cfg.StrOpt('signing_dir'), cfg.StrOpt('signing_dir',
default=os.path.expanduser('~/keystone-signing')),
cfg.ListOpt('memcache_servers'), cfg.ListOpt('memcache_servers'),
cfg.IntOpt('token_cache_time', default=300), cfg.IntOpt('token_cache_time', default=300),
] ]
@@ -237,8 +238,6 @@ class AuthProtocol(object):
#signing #signing
self.signing_dirname = self._conf_get('signing_dir') self.signing_dirname = self._conf_get('signing_dir')
if self.signing_dirname is None:
self.signing_dirname = '%s/keystone-signing' % os.environ['HOME']
self.LOG.info('Using %s as cache directory for signing certificate' % self.LOG.info('Using %s as cache directory for signing certificate' %
self.signing_dirname) self.signing_dirname)
if (os.path.exists(self.signing_dirname) and if (os.path.exists(self.signing_dirname) and