summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:17:16 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:17:16 -0500
commitdfc5f881255c3b644a0aeae46070d661039e873f (patch)
tree11b222c7ed522f9e1b33b1c55a0cc552fa957dfd
parent981c3c8621e36f0c90506923293bb3c8d6444376 (diff)
parent37517bf00da3491819c4b47c113ad29e2b3ae9cd (diff)
downloadopenshift-dfc5f881255c3b644a0aeae46070d661039e873f.tar.gz
openshift-dfc5f881255c3b644a0aeae46070d661039e873f.tar.bz2
openshift-dfc5f881255c3b644a0aeae46070d661039e873f.tar.xz
openshift-dfc5f881255c3b644a0aeae46070d661039e873f.zip
Merge pull request #796 from abutcher/master-proxy-certs
Fix issue with master.proxy-client.{crt,key} and omit.
-rw-r--r--roles/openshift_master_certificates/tasks/main.yml23
1 files changed, 14 insertions, 9 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index e966e793e..13e5d7a4b 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
command: >