diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-04-30 17:04:15 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-06-10 11:29:23 -0400 |
| commit | b57392ddd54bbff225ba83dd5a5bf40ea99344a4 (patch) | |
| tree | 28700b81ad52e4535604a4646baeea1c54b880c9 /roles/openshift_node | |
| parent | fe458e2c29bffdab7708b67539a36a08506560da (diff) | |
| download | openshift-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_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 8af41b732..dc2b491aa 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -1,6 +1,7 @@ --- # TODO: allow for overriding default ports where possible # TODO: trigger the external service when restart is needed +# TODO: work with upstream to fix naming of 'master-client.crt/master-client.key' - name: Set node OpenShift facts openshift_facts: @@ -15,9 +16,9 @@ with_items: - "{{ openshift_node_cert_dir }}" - "{{ openshift_node_cert_dir }}/ca.crt" - - "{{ openshift_node_cert_dir }}/client.crt" - - "{{ openshift_node_cert_dir }}/client.key" - - "{{ openshift_node_cert_dir }}/.kubeconfig" + - "{{ openshift_node_cert_dir }}/master-client.crt" + - "{{ openshift_node_cert_dir }}/master-client.key" + - "{{ openshift_node_cert_dir }}/node.kubeconfig" - "{{ openshift_node_cert_dir }}/node-config.yaml" - "{{ openshift_node_cert_dir }}/server.crt" - "{{ openshift_node_cert_dir }}/server.key" |