diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-01 21:47:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 21:47:22 -0500 |
| commit | 4a3e61e035e42a260e0bf59d1e0c891dc004d50d (patch) | |
| tree | c51539c2a913454fb9dd42772cf5786e2382ff31 /roles | |
| parent | 00683cbb4b222f702b8367b8d259d8e7049d2a8e (diff) | |
| parent | 00a0b457da181a6922bfa9896a9e49f638bfc0d7 (diff) | |
| download | openshift-4a3e61e035e42a260e0bf59d1e0c891dc004d50d.tar.gz openshift-4a3e61e035e42a260e0bf59d1e0c891dc004d50d.tar.bz2 openshift-4a3e61e035e42a260e0bf59d1e0c891dc004d50d.tar.xz openshift-4a3e61e035e42a260e0bf59d1e0c891dc004d50d.zip | |
Merge pull request #3528 from abutcher/master-scaleup
Bug 1427003: Failed to add masters if openshift_master_ca_certificate is defined
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_ca/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master_facts/filter_plugins/openshift_master.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml index ae3ad31c3..70c2a9121 100644 --- a/roles/openshift_ca/tasks/main.yml +++ b/roles/openshift_ca/tasks/main.yml @@ -60,6 +60,7 @@ copy: src: "{{ item.src }}" dest: "{{ openshift_ca_config_dir }}/{{ item.dest }}" + force: no with_items: - src: "{{ (openshift_master_ca_certificate | default({'certfile':none})).certfile }}" dest: ca.crt diff --git a/roles/openshift_master_facts/filter_plugins/openshift_master.py b/roles/openshift_master_facts/filter_plugins/openshift_master.py index 6d009077a..db24028cd 100644 --- a/roles/openshift_master_facts/filter_plugins/openshift_master.py +++ b/roles/openshift_master_facts/filter_plugins/openshift_master.py @@ -527,7 +527,7 @@ class FilterModule(object): 'master.kubelet-client.crt', 'master.kubelet-client.key'] if bool(include_ca): - certs += ['ca.crt', 'ca.key'] + certs += ['ca.crt', 'ca.key', 'ca-bundle.crt'] if bool(include_keys): certs += ['serviceaccounts.private.key', 'serviceaccounts.public.key'] |