From cd34d8f80d2e1ae3fbea0cc2b4d33de149d281da Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Fri, 30 Jun 2017 20:24:35 +0300 Subject: [PATCH] Ensure get_password is accessing a file that exists. --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index cd21be31c08..0bc39a58404 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -920,9 +920,9 @@ def setup_tokens(token, username, user): def get_password(csv_fname, user): '''Get the password of user within the csv file provided.''' root_cdk = '/root/cdk' - if not os.path.isdir(root_cdk): - return None tokens_fname = os.path.join(root_cdk, csv_fname) + if not os.path.isfile(tokens_fname): + return None with open(tokens_fname, 'r') as stream: for line in stream: record = line.split(',')