From e9ec399e66a737dd04fed79a2ba23ec34263cca2 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Thu, 13 Dec 2012 12:00:59 -0600 Subject: [PATCH] Use os.path to find ~/keystone-signing (bug 1078947) Change-Id: Ie816d34299c92ba7d5cf6acf717ccfbf029f724f --- keystoneclient/middleware/auth_token.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index dcfba1f40..33ea1153a 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -167,7 +167,8 @@ opts = [ cfg.StrOpt('cache', default=None), # env key for the swift cache cfg.StrOpt('certfile'), cfg.StrOpt('keyfile'), - cfg.StrOpt('signing_dir'), + cfg.StrOpt('signing_dir', + default=os.path.expanduser('~/keystone-signing')), cfg.ListOpt('memcache_servers'), cfg.IntOpt('token_cache_time', default=300), ] @@ -237,8 +238,6 @@ class AuthProtocol(object): #signing 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.signing_dirname) if (os.path.exists(self.signing_dirname) and