diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-11-29 09:37:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-29 09:37:11 -0500 |
commit | aff556902f5851d61df34a83dfff2b3ff891fef8 (patch) | |
tree | d6247557b0eb5cd2936608ba5c0b93dc4a9281f5 /roles/openshift_hosted/tasks/storage | |
parent | 8f9f84b27ce12d07eed2269df0a118f112554f7a (diff) | |
parent | e893c818a62665729bcdabe27cf0b3f05937d374 (diff) | |
download | openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.gz openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.bz2 openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.tar.xz openshift-aff556902f5851d61df34a83dfff2b3ff891fef8.zip |
Merge pull request #5723 from mjudeikis/gluster-registry-backend
Add external glusterfs backend to hosted and glusterfs playbook
Diffstat (limited to 'roles/openshift_hosted/tasks/storage')
-rw-r--r-- | roles/openshift_hosted/tasks/storage/glusterfs.yml | 2 | ||||
-rw-r--r-- | roles/openshift_hosted/tasks/storage/glusterfs_endpoints.yml | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/storage/glusterfs.yml b/roles/openshift_hosted/tasks/storage/glusterfs.yml index 81241535b..7cae67baa 100644 --- a/roles/openshift_hosted/tasks/storage/glusterfs.yml +++ b/roles/openshift_hosted/tasks/storage/glusterfs.yml @@ -35,7 +35,7 @@ mount: state: mounted fstype: glusterfs - src: "{% if 'glusterfs_registry' in groups %}{% set node = groups.glusterfs_registry[0] %}{% else %}{% set node = groups.glusterfs[0] %}{% endif %}{% if 'glusterfs_hostname' in hostvars[node] %}{{ hostvars[node].glusterfs_hostname }}{% elif 'openshift' in hostvars[node] %}{{ hostvars[node].openshift.node.nodename }}{% else %}{{ node }}{% endif %}:/{{ openshift.hosted.registry.storage.glusterfs.path }}" + src: "{% if 'glusterfs_registry' in groups %}{% set node = groups.glusterfs_registry[0] %}{% elif 'glusterfs' in groups %}{% set node = groups.glusterfs[0] %}{% endif %}{% if openshift_hosted_registry_storage_glusterfs_ips is defined and openshift_hosted_registry_storage_glusterfs_ips|length > 0 %}{{ openshift_hosted_registry_storage_glusterfs_ips[0] }}{% elif 'glusterfs_hostname' in hostvars[node] %}{{ hostvars[node].glusterfs_hostname }}{% elif 'openshift' in hostvars[node] %}{{ hostvars[node].openshift.node.nodename }}{% else %}{{ node }}{% endif %}:/{{ openshift.hosted.registry.storage.glusterfs.path }}" name: "{{ mktemp.stdout }}" - name: Set registry volume permissions diff --git a/roles/openshift_hosted/tasks/storage/glusterfs_endpoints.yml b/roles/openshift_hosted/tasks/storage/glusterfs_endpoints.yml new file mode 100644 index 000000000..0f4381748 --- /dev/null +++ b/roles/openshift_hosted/tasks/storage/glusterfs_endpoints.yml @@ -0,0 +1,16 @@ +--- +- name: Generate GlusterFS registry endpoints + template: + src: "{{ openshift.common.examples_content_version }}/glusterfs-registry-endpoints.yml.j2" + dest: "{{ mktempHosted.stdout }}/glusterfs-registry-endpoints.yml" + +- name: Generate GlusterFS registry service + template: + src: "{{ openshift.common.examples_content_version }}/glusterfs-registry-service.yml.j2" + dest: "{{ mktempHosted.stdout }}/glusterfs-registry-service.yml" + +- name: Create GlusterFS registry service and endpoint + command: "{{ openshift.common.client_binary }} apply -f {{ item }} -n {{ openshift.hosted.registry.namespace | default('default') }}" + with_items: + - "{{ mktempHosted.stdout }}/glusterfs-registry-service.yml" + - "{{ mktempHosted.stdout }}/glusterfs-registry-endpoints.yml" |