From b56907db97edcb85aaf9816c3e603d311fd8f316 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Thu, 5 Nov 2015 07:25:53 -0500
Subject: Don't check for certs in data_dir just raise when they can't be
found. Fix typo.
---
filter_plugins/oo_filters.py | 9 ++-------
roles/openshift_facts/library/openshift_facts.py | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index f494c0ae5..44872ba28 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -378,13 +378,8 @@ class FilterModule(object):
certificate['names'] = []
if not os.path.isfile(certificate['certfile']) and not os.path.isfile(certificate['keyfile']):
- # Unable to find cert/key, try to prepend data_dir to paths
- certificate['certfile'] = os.path.join(data_dir, certificate['certfile'])
- certificate['keyfile'] = os.path.join(data_dir, certificate['keyfile'])
- if not os.path.isfile(certificate['certfile']) and not os.path.isfile(certificate['keyfile']):
- # Unable to find cert/key in data_dir
- raise errors.AnsibleFilterError("|certificate and/or key does not exist '%s', '%s'" %
- (certificate['certfile'], certificate['keyfile']))
+ raise errors.AnsibleFilterError("|certificate and/or key does not exist '%s', '%s'" %
+ (certificate['certfile'], certificate['keyfile']))
try:
st_cert = open(certificate['certfile'], 'rt').read()
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 134734a65..1b37de08b 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -517,7 +517,7 @@ def set_aggregate_facts(facts):
facts['master']['etcd_data_dir'] = '/var/lib/etcd'
facts['common']['all_hostnames'] = list(all_hostnames)
- facts['common']['internal_hostnames'] = list(all_hostnames)
+ facts['common']['internal_hostnames'] = list(internal_hostnames)
return facts
--
cgit v1.2.3