diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-31 17:21:23 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-14 16:45:59 -0500 |
| commit | 346ce4fc595ed618e589666a87b441b40e392e73 (patch) | |
| tree | b1ff902f89fad74466bcbab7c0d334a49cb7d813 /roles/openshift_master_facts | |
| parent | a7462fda03cd9a749f20f0e5885b3dedefd0447e (diff) | |
| download | openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.gz openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.bz2 openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.xz openshift-346ce4fc595ed618e589666a87b441b40e392e73.zip | |
Removed old version code
This commit removes any references to versions < 1.5/3.5
We assume the version is always greater than or equal to 1.5/3.5.
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/filter_plugins/openshift_master.py | 23 |
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 |