Merge pull request #1142 from abutcher/new-certs-who-dis

Support for redeploying certificates

1 files changed, 5 insertions, 4 deletions

diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index b3f284a8e..048cd04c7 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -521,7 +521,7 @@ class FilterModule(object):
         return valid
 
     @staticmethod
-    def certificates_to_synchronize(hostvars):
+    def certificates_to_synchronize(hostvars, include_keys=True):
         ''' Return certificates to synchronize based on facts. '''
         if not issubclass(type(hostvars), dict):
             raise errors.AnsibleFilterError("|failed expects hostvars is a dict")
@@ -535,9 +535,10 @@ class FilterModule(object):
                  'openshift-registry.kubeconfig',
                  'openshift-router.crt',
                  'openshift-router.key',
-                 'openshift-router.kubeconfig',
-                 'serviceaccounts.private.key',
-                 'serviceaccounts.public.key']
+                 'openshift-router.kubeconfig']
+        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']