summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_certificates/vars
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-05-17 10:24:41 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-05-19 14:54:56 -0400
commitc9cd222f8eab56a31c6ff237739653672c7010af (patch)
tree10a0eea158d4e5360f90ccc65837012a87e9dcf4 /roles/openshift_node_certificates/vars
parentc78e91c7d4a304cc5d20135e96206008407c5f6f (diff)
downloadopenshift-c9cd222f8eab56a31c6ff237739653672c7010af.tar.gz
openshift-c9cd222f8eab56a31c6ff237739653672c7010af.tar.bz2
openshift-c9cd222f8eab56a31c6ff237739653672c7010af.tar.xz
openshift-c9cd222f8eab56a31c6ff237739653672c7010af.zip
Consolidate ca/master/node certificates roles into openshift_certificates.
Diffstat (limited to 'roles/openshift_node_certificates/vars')
-rw-r--r--roles/openshift_node_certificates/vars/main.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_node_certificates/vars/main.yml b/roles/openshift_node_certificates/vars/main.yml
index 61fbb1e51..2fafc7387 100644
--- a/roles/openshift_node_certificates/vars/main.yml
+++ b/roles/openshift_node_certificates/vars/main.yml
@@ -1,7 +1,6 @@
---
-openshift_node_config_dir: "{{ openshift.common.config_base }}/node"
-openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
openshift_generated_configs_dir: "{{ openshift.common.config_base }}/generated-configs"
-openshift_master_ca_cert: "{{ openshift_master_config_dir }}/ca.crt"
-openshift_master_ca_key: "{{ openshift_master_config_dir }}/ca.key"
-openshift_master_ca_serial: "{{ openshift_master_config_dir }}/ca.serial.txt"
+openshift_node_cert_dir: "{{ openshift.common.config_base }}/node"
+openshift_node_cert_subdir: "node-{{ openshift.common.hostname }}"
+openshift_node_config_dir: "{{ openshift.common.config_base }}/node"
+openshift_node_generated_config_dir: "{{ openshift_generated_configs_dir }}/{{ openshift_node_cert_subdir }}"