summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-02 14:44:53 -0400
committerGitHub <noreply@github.com>2017-08-02 14:44:53 -0400
commite8b99e303e94ae38a9dfce59a36413c88bcfc57c (patch)
treecae0348dbf2ad7fc59607e9775d98a8304a3fe7a /roles
parent4d88cc6eb79cc7402f09917dfc9a95e2636db652 (diff)
parent5d78e74dae92199c2e07627f91ae2a0c780f6437 (diff)
downloadopenshift-e8b99e303e94ae38a9dfce59a36413c88bcfc57c.tar.gz
openshift-e8b99e303e94ae38a9dfce59a36413c88bcfc57c.tar.bz2
openshift-e8b99e303e94ae38a9dfce59a36413c88bcfc57c.tar.xz
openshift-e8b99e303e94ae38a9dfce59a36413c88bcfc57c.zip
Merge pull request #4981 from jarrpa/heketi-key-fix
GlusterFS: Copy SSH private key to master node.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index 19eb3cdf7..3c8621bbf 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -163,6 +163,11 @@
- glusterfs_heketi_is_native
- glusterfs_heketi_user_key is undefined
+- name: Copy heketi private key
+ copy:
+ src: "{{ glusterfs_heketi_ssh_keyfile }}"
+ dest: "{{ mktemp.stdout }}/private_key"
+
- name: Create heketi config secret
oc_secret:
namespace: "{{ glusterfs_namespace }}"
@@ -173,7 +178,7 @@
- name: heketi.json
path: "{{ mktemp.stdout }}/heketi.json"
- name: private_key
- path: "{{ glusterfs_heketi_ssh_keyfile }}"
+ path: "{{ mktemp.stdout }}/private_key"
when:
- glusterfs_heketi_is_native