diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-06 13:02:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 13:02:38 -0500 |
| commit | 7593c93d4c8d8e5eb22e866fa87208611f0c4bf6 (patch) | |
| tree | 02b3957f9c3d1ad23e0424e47dca07c295ed50d5 | |
| parent | ad5acf5d137721b4affc3d826569d42c5b87f8f3 (diff) | |
| parent | e7afe8eafbe66ea7d9fb2ff2aa24275434542099 (diff) | |
| download | openshift-7593c93d4c8d8e5eb22e866fa87208611f0c4bf6.tar.gz openshift-7593c93d4c8d8e5eb22e866fa87208611f0c4bf6.tar.bz2 openshift-7593c93d4c8d8e5eb22e866fa87208611f0c4bf6.tar.xz openshift-7593c93d4c8d8e5eb22e866fa87208611f0c4bf6.zip | |
Merge pull request #3266 from abutcher/bz1419026
Bug 1419026 - openshift_master_certificates task failed when installing multiple masters env
| -rw-r--r-- | filter_plugins/openshift_master.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py index 77b0a3dc9..4ccee91f9 100644 --- a/filter_plugins/openshift_master.py +++ b/filter_plugins/openshift_master.py @@ -525,13 +525,7 @@ class FilterModule(object): 'admin.key', 'admin.kubeconfig', 'master.kubelet-client.crt', - 'master.kubelet-client.key', - 'openshift-registry.crt', - 'openshift-registry.key', - 'openshift-registry.kubeconfig', - 'openshift-router.crt', - 'openshift-router.key', - 'openshift-router.kubeconfig'] + 'master.kubelet-client.key'] if bool(include_ca): certs += ['ca.crt', 'ca.key'] if bool(include_keys): @@ -547,6 +541,13 @@ class FilterModule(object): 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 |