diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 13:11:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 13:11:59 -0400 |
| commit | 4507beb2d4f4709583b3cba3eec7c5b57163e9bc (patch) | |
| tree | 9e4f7229780e7a19329d631bf729f971225057de /roles/openshift_node_certificates/vars | |
| parent | 19b6794f877e723c0828e6e592dfaa99f0207d18 (diff) | |
| parent | 4ec879a68e7d50f7848364c8cb5b55e82694ef00 (diff) | |
| download | openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.gz openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.bz2 openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.xz openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.zip | |
Merge pull request #1990 from abutcher/openshift-certificates
Refactor openshift certificates roles.
Diffstat (limited to 'roles/openshift_node_certificates/vars')
| -rw-r--r-- | roles/openshift_node_certificates/vars/main.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/roles/openshift_node_certificates/vars/main.yml b/roles/openshift_node_certificates/vars/main.yml index 61fbb1e51..17ad8106d 100644 --- a/roles/openshift_node_certificates/vars/main.yml +++ b/roles/openshift_node_certificates/vars/main.yml @@ -1,7 +1,11 @@ --- -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 }}" + +openshift_ca_config_dir: "{{ openshift.common.config_base }}/master" +openshift_ca_cert: "{{ openshift_ca_config_dir }}/ca.crt" +openshift_ca_key: "{{ openshift_ca_config_dir }}/ca.key" +openshift_ca_serial: "{{ openshift_ca_config_dir }}/ca.serial.txt" |