summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-09-12 12:25:46 -0400
committerGitHub <noreply@github.com>2016-09-12 12:25:46 -0400
commita528b97c741ec8d6ece35849ea29f2e5efd6f8c4 (patch)
tree83bdb78e36557f594dca551bd192d67ebd0afcda
parent81eba2cadddce526ec41ec9b9157098cf15e2d18 (diff)
parent027d55f6b7b22c868501ed37ac97f585d9f60390 (diff)
downloadopenshift-a528b97c741ec8d6ece35849ea29f2e5efd6f8c4.tar.gz
openshift-a528b97c741ec8d6ece35849ea29f2e5efd6f8c4.tar.bz2
openshift-a528b97c741ec8d6ece35849ea29f2e5efd6f8c4.tar.xz
openshift-a528b97c741ec8d6ece35849ea29f2e5efd6f8c4.zip
Merge pull request #2431 from elyscape/2430-always-dedupe-cert-names
Always deduplicate detected certificate names
-rw-r--r--filter_plugins/oo_filters.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 7b241e203..eeb04cb4e 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -529,9 +529,9 @@ class FilterModule(object):
raise errors.AnsibleFilterError(("|failed to parse certificate '%s', " % certificate['certfile'] +
"please specify certificate names in host inventory"))
+ certificate['names'] = list(set(certificate['names']))
if 'cafile' not in certificate:
certificate['names'] = [name for name in certificate['names'] if name not in internal_hostnames]
- certificate['names'] = list(set(certificate['names']))
if not certificate['names']:
raise errors.AnsibleFilterError(("|failed to parse certificate '%s' or " % certificate['certfile'] +
"detected a collision with internal hostname, please specify " +