summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTANABE Ken-ichi <nabeken@tknetworks.org>2008-06-28 15:44:00 +0900
committerTANABE Ken-ichi <nabeken@tknetworks.org>2008-06-28 15:44:00 +0900
commitc82e6e787268e7894582222e11c155a088f10964 (patch)
tree7d3bb92ff6d4409b1b647d37a57454619501287b
parentf70000482a1290752698ccec10cbc6670f990d65 (diff)
downloadthird_party-func-c82e6e787268e7894582222e11c155a088f10964.tar.gz
third_party-func-c82e6e787268e7894582222e11c155a088f10964.tar.xz
third_party-func-c82e6e787268e7894582222e11c155a088f10964.zip
Using config.cert_extension instead of hardcoded cert file extension '.cert'
-rwxr-xr-xfunc/overlord/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py
index fb436ed..727746b 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -111,11 +111,11 @@ class Minions(object):
seperate_gloobs = self.spec.split(";")
seperate_gloobs = seperate_gloobs + self.new_hosts
for each_gloob in seperate_gloobs:
- actual_gloob = "%s/%s.cert" % (self.config.certroot, each_gloob)
+ actual_gloob = "%s/%s.%s" % (self.config.certroot, each_gloob, self.config.cert_extension)
certs = glob.glob(actual_gloob)
for cert in certs:
self.all_certs.append(cert)
- host = cert.replace(self.config.certroot,"")[1:-5]
+ host = cert.replace(self.config.certroot,"")[1:-(len(self.config.cert_extension) + 1)]
self.all_hosts.append(host)
return self.all_hosts