summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-15 14:06:31 -0500
committerGitHub <noreply@github.com>2017-11-15 14:06:31 -0500
commitbedbf78b8d2a71bd11301b555aa7a3c34c7bac5c (patch)
treebe25d717c47f8e5b2ef495f15d9cedc32c8b15d2 /roles/openshift_master_facts
parent719e608f81fbf539da0dca16234ef271b9cbe3d3 (diff)
parent346ce4fc595ed618e589666a87b441b40e392e73 (diff)
downloadopenshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.gz
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.bz2
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.xz
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.zip
Merge pull request #5968 from mgugino-upstream-stage/version-scrub
Removed old version code
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r--roles/openshift_master_facts/filter_plugins/openshift_master.py23
1 files changed, 5 insertions, 18 deletions
diff --git a/roles/openshift_master_facts/filter_plugins/openshift_master.py b/roles/openshift_master_facts/filter_plugins/openshift_master.py
index 97a5179e0..c827f2d26 100644
--- a/roles/openshift_master_facts/filter_plugins/openshift_master.py
+++ b/roles/openshift_master_facts/filter_plugins/openshift_master.py
@@ -518,29 +518,16 @@ class FilterModule(object):
'admin.key',
'admin.kubeconfig',
'master.kubelet-client.crt',
- 'master.kubelet-client.key']
+ 'master.kubelet-client.key',
+ 'master.proxy-client.crt',
+ 'master.proxy-client.key',
+ 'service-signer.crt',
+ 'service-signer.key']
if bool(include_ca):
certs += ['ca.crt', 'ca.key', 'ca-bundle.crt', 'client-ca-bundle.crt']
if bool(include_keys):
certs += ['serviceaccounts.private.key',
'serviceaccounts.public.key']
- if bool(hostvars['openshift']['common']['version_gte_3_1_or_1_1']):
- certs += ['master.proxy-client.crt',
- 'master.proxy-client.key']
- if not bool(hostvars['openshift']['common']['version_gte_3_2_or_1_2']):
- certs += ['openshift-master.crt',
- 'openshift-master.key',
- 'openshift-master.kubeconfig']
- if bool(hostvars['openshift']['common']['version_gte_3_3_or_1_3']):
- certs += ['service-signer.crt',
- 'service-signer.key']
- if not bool(hostvars['openshift']['common']['version_gte_3_5_or_1_5']):
- certs += ['openshift-registry.crt',
- 'openshift-registry.key',
- 'openshift-registry.kubeconfig',
- 'openshift-router.crt',
- 'openshift-router.key',
- 'openshift-router.kubeconfig']
return certs
@staticmethod