From 37517bf00da3491819c4b47c113ad29e2b3ae9cd Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Mon, 2 Nov 2015 16:25:10 -0500
Subject: Fix issue with master.proxy-client.{crt,key} and omit.

---
 roles/openshift_master_certificates/tasks/main.yml | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'roles/openshift_master_certificates')

diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index e4602337e..9bc59d89d 100644
--- a/roles/openshift_master_certificates/tasks/main.yml
+++ b/roles/openshift_master_certificates/tasks/main.yml
@@ -6,13 +6,9 @@
     mode: 0700
   with_items: masters_needing_certs
 
-- file:
-    src: "{{ openshift_master_config_dir }}/{{ item.1 }}"
-    dest: "{{ openshift_generated_configs_dir }}/{{ item.0.master_cert_subdir }}/{{ item.1 }}"
-    state: hard
-  with_nested:
-  - masters_needing_certs
-  - - ca.crt
+- set_fact:
+    master_certificates:
+    - ca.crt
     - ca.key
     - ca.serial.txt
     - admin.crt
@@ -20,8 +16,6 @@
     - admin.kubeconfig
     - master.kubelet-client.crt
     - master.kubelet-client.key
-    - "{{ 'master.proxy-client.crt' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}"
-    - "{{ 'master.proxy-client.key' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}"
     - openshift-master.crt
     - openshift-master.key
     - openshift-master.kubeconfig
@@ -33,6 +27,17 @@
     - openshift-router.kubeconfig
     - serviceaccounts.private.key
     - serviceaccounts.public.key
+    master_31_certificates:
+    - master.proxy-client.crt
+    - master.proxy-client.key
+
+- file:
+    src: "{{ openshift_master_config_dir }}/{{ item.1 }}"
+    dest: "{{ openshift_generated_configs_dir }}/{{ item.0.master_cert_subdir }}/{{ item.1 }}"
+    state: hard
+  with_nested:
+  - masters_needing_certs
+  - "{{ master_certificates | union(master_31_certificates) if openshift.common.version_greater_than_3_1_or_1_1 | bool else master_certificates }}"
 
 
 - name: Create the master certificates if they do not already exist
-- 
cgit v1.2.3