Merge pull request #3528 from abutcher/master-scaleup

Bug 1427003: Failed to add masters if openshift_master_ca_certificate is defined
openshift · Mar 2, 2017 · 4a3e61e · 4a3e61e
2 parents 00683cb + 00a0b45
commit 4a3e61e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -527,7 +527,7 @@ def certificates_to_synchronize(hostvars, include_keys=True, include_ca=True):
                  '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']