diff options
author | Jose A. Rivera <jarrpa@redhat.com> | 2017-07-07 15:21:58 -0500 |
---|---|---|
committer | Jose A. Rivera <jarrpa@redhat.com> | 2017-07-08 16:09:39 -0500 |
commit | 726dae9a3fa4b8e825387c39e2d5ef4a34095b7c (patch) | |
tree | dc4d387b39419cff57a0892c7503318fc257cfcb /roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | |
parent | 2c647a966f141dff1aa1d716747e44b7d0923fd1 (diff) | |
download | openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.gz openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.bz2 openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.tar.xz openshift-726dae9a3fa4b8e825387c39e2d5ef4a34095b7c.zip |
GlusterFS: Fix SSH-based heketi configuration
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml')
-rw-r--r-- | roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml index af901103e..99ad029da 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml @@ -19,6 +19,8 @@ name: "heketi-storage-endpoints" - kind: "secret" name: "heketi-{{ glusterfs_name }}-topology-secret" + - kind: "secret" + name: "heketi-{{ glusterfs_name }}-config-secret" - kind: "template,route,service,dc" name: "heketi-{{ glusterfs_name }}" - kind: "svc" @@ -125,6 +127,13 @@ when: - glusterfs_heketi_topology_load +- name: Generate heketi config file + template: + src: "{{ openshift.common.examples_content_version }}/heketi.json.j2" + dest: "{{ mktemp.stdout }}/heketi.json" + when: + - glusterfs_heketi_is_native + - name: Generate heketi admin key set_fact: glusterfs_heketi_admin_key: "{{ 32 | oo_generate_secret }}" @@ -142,6 +151,20 @@ - glusterfs_heketi_is_native - glusterfs_heketi_user_key is undefined +- name: Create heketi config secret + oc_secret: + namespace: "{{ glusterfs_namespace }}" + state: present + name: "heketi-{{ glusterfs_name }}-config-secret" + force: True + files: + - name: heketi.json + path: "{{ mktemp.stdout }}/heketi.json" + - name: private_key + path: "{{ glusterfs_heketi_ssh_keyfile }}" + when: + - glusterfs_heketi_is_native + - include: heketi_deploy_part1.yml when: - glusterfs_heketi_is_native |