summaryrefslogtreecommitdiffstats
path: root/roles/openshift_register_nodes/vars/main.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-04-30 17:04:15 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-06-10 11:29:23 -0400
commitb57392ddd54bbff225ba83dd5a5bf40ea99344a4 (patch)
tree28700b81ad52e4535604a4646baeea1c54b880c9 /roles/openshift_register_nodes/vars/main.yml
parentfe458e2c29bffdab7708b67539a36a08506560da (diff)
downloadopenshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.gz
openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.bz2
openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.tar.xz
openshift-b57392ddd54bbff225ba83dd5a5bf40ea99344a4.zip
Accomodate upstream configuration change
- Master config and certificates are now in /etc/openshift/master - Node config is now in /etc/openshift/node - Several certificates have been renamed to accomodate a flattening of structure to accomodate secret storage - Add openshift_data_dir to ensure etcd and volumes are stored in /var/lib/openshift - Add openshift_generated_configs_dir
Diffstat (limited to 'roles/openshift_register_nodes/vars/main.yml')
-rw-r--r--roles/openshift_register_nodes/vars/main.yml13
1 files changed, 7 insertions, 6 deletions
diff --git a/roles/openshift_register_nodes/vars/main.yml b/roles/openshift_register_nodes/vars/main.yml
index bd497f08f..ebc0a0ef4 100644
--- a/roles/openshift_register_nodes/vars/main.yml
+++ b/roles/openshift_register_nodes/vars/main.yml
@@ -1,7 +1,8 @@
---
-openshift_cert_parent_dir: /var/lib/openshift
-openshift_cert_relative_dir: openshift.local.certificates
-openshift_cert_dir: "{{ openshift_cert_parent_dir }}/{{ openshift_cert_relative_dir }}"
-openshift_master_ca_dir: "{{ openshift_cert_dir }}/ca"
-openshift_master_ca_cert: "{{ openshift_master_ca_dir }}/cert.crt"
-openshift_master_ca_key: "{{ openshift_master_ca_dir }}/key.key"
+openshift_node_config_dir: /etc/openshift/node
+openshift_master_config_dir: /etc/openshift/master
+openshift_generated_configs_dir: /etc/openshift/generated-configs
+openshift_data_dir: /var/lib/openshift
+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"