Merge "Fix --no-kinit option throwing a traceback"

This commit is contained in:
Jenkins 2017-08-17 21:31:15 +00:00 committed by Gerrit Code Review
commit 292ae20fe0

View File

@ -283,6 +283,8 @@ class NovajoinRole(object):
if self.ccache_name: if self.ccache_name:
current_ccache = os.environ.get('KRB5CCNAME') current_ccache = os.environ.get('KRB5CCNAME')
os.environ['KRB5CCNAME'] = self.ccache_name os.environ['KRB5CCNAME'] = self.ccache_name
else:
current_ccache = None
try: try:
if os.path.exists(self.keytab): if os.path.exists(self.keytab):