summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-29 11:33:28 -0400
committerGitHub <noreply@github.com>2016-09-29 11:33:28 -0400
commit762df1e3808d06a6c0c608af8830d6a882a70bf6 (patch)
tree8fa77424a08475fffb0e6eeaef9457fcf419d8d5
parentbe3a68ae520d518daef2e35553c28cd150d3c344 (diff)
parentb1c6bd781f833efe3532fe574b41b57bce9a72bc (diff)
downloadopenshift-762df1e3808d06a6c0c608af8830d6a882a70bf6.tar.gz
openshift-762df1e3808d06a6c0c608af8830d6a882a70bf6.tar.bz2
openshift-762df1e3808d06a6c0c608af8830d6a882a70bf6.tar.xz
openshift-762df1e3808d06a6c0c608af8830d6a882a70bf6.zip
Merge pull request #2528 from abutcher/named-cert-symlinks
Set named certificate destinations as basenames of provided paths.
-rw-r--r--roles/openshift_named_certificates/tasks/main.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_named_certificates/tasks/main.yml b/roles/openshift_named_certificates/tasks/main.yml
index 7f20cf401..1bcf9ef67 100644
--- a/roles/openshift_named_certificates/tasks/main.yml
+++ b/roles/openshift_named_certificates/tasks/main.yml
@@ -28,19 +28,19 @@
- name: Land named certificates
copy:
src: "{{ item.certfile }}"
- dest: "{{ named_certs_dir }}"
+ dest: "{{ named_certs_dir }}/{{ item.certfile | basename }}"
with_items: "{{ named_certificates }}"
- name: Land named certificate keys
copy:
src: "{{ item.keyfile }}"
- dest: "{{ named_certs_dir }}"
+ dest: "{{ named_certs_dir }}/{{ item.keyfile | basename }}"
mode: 0600
with_items: "{{ named_certificates }}"
- name: Land named CA certificates
copy:
src: "{{ item }}"
- dest: "{{ named_certs_dir }}"
+ dest: "{{ named_certs_dir }}/{{ item | basename }}"
mode: 0600
with_items: "{{ named_certificates | oo_collect('cafile') }}"