diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-07 22:45:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 22:45:14 -0400 |
| commit | ac7b7760937e9c6cf3f13a43d9e0d6e5518753a8 (patch) | |
| tree | db5490283376d96c38207d1a71ebcdcb19964082 /roles | |
| parent | cd7aea4d9c13d366ddf14095ae4d63560e2dbb7b (diff) | |
| parent | 7bfd825b43b6c6dc234f1123b518257be4c08039 (diff) | |
| download | openshift-ac7b7760937e9c6cf3f13a43d9e0d6e5518753a8.tar.gz openshift-ac7b7760937e9c6cf3f13a43d9e0d6e5518753a8.tar.bz2 openshift-ac7b7760937e9c6cf3f13a43d9e0d6e5518753a8.tar.xz openshift-ac7b7760937e9c6cf3f13a43d9e0d6e5518753a8.zip | |
Merge pull request #4719 from abutcher/glusterfs-nodename
Merged by openshift-bot
Diffstat (limited to 'roles')
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_storage_glusterfs/README.md b/roles/openshift_storage_glusterfs/README.md index da4e348b4..4b9a5f42c 100644 --- a/roles/openshift_storage_glusterfs/README.md +++ b/roles/openshift_storage_glusterfs/README.md @@ -63,7 +63,7 @@ their configuration as GlusterFS nodes: | Name | Default value | Description | |--------------------|---------------------------|-----------------------------------------| | glusterfs_cluster | 1 | The ID of the cluster this node should belong to. This is useful when a single heketi service is expected to manage multiple distinct clusters. **NOTE:** For natively-hosted clusters, all pods will be in the same OpenShift namespace -| glusterfs_hostname | openshift.common.hostname | A hostname (or IP address) that will be used for internal GlusterFS communication +| glusterfs_hostname | openshift.node.nodename | A hostname (or IP address) that will be used for internal GlusterFS communication | glusterfs_ip | openshift.common.ip | An IP address that will be used by pods to communicate with the GlusterFS node | glusterfs_zone | 1 | A zone number for the node. Zones are used within the cluster for determining how to distribute the bricks of GlusterFS volumes. heketi will try to spread each volumes' bricks as evenly as possible across all zones diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml index ea4dcc510..3db5cc389 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml @@ -18,7 +18,7 @@ - name: Unlabel any existing GlusterFS nodes oc_label: - name: "{{ hostvars[item].openshift.common.hostname }}" + name: "{{ hostvars[item].openshift.node.nodename }}" kind: node state: absent labels: "{{ glusterfs_nodeselector | oo_dict_to_list_of_dict }}" @@ -67,7 +67,7 @@ - name: Label GlusterFS nodes oc_label: - name: "{{ hostvars[item].openshift.common.hostname }}" + name: "{{ hostvars[item].openshift.node.nodename }}" kind: node state: add labels: "{{ glusterfs_nodeselector | oo_dict_to_list_of_dict }}" diff --git a/roles/openshift_storage_glusterfs/templates/v3.6/topology.json.j2 b/roles/openshift_storage_glusterfs/templates/v3.6/topology.json.j2 index 33d8f9b36..3aac68e2f 100644 --- a/roles/openshift_storage_glusterfs/templates/v3.6/topology.json.j2 +++ b/roles/openshift_storage_glusterfs/templates/v3.6/topology.json.j2 @@ -17,7 +17,7 @@ "node": { "hostnames": { "manage": [ - "{{ hostvars[node].glusterfs_hostname | default(hostvars[node].openshift.common.hostname) }}" + "{{ hostvars[node].glusterfs_hostname | default(hostvars[node].openshift.node.nodename) }}" ], "storage": [ "{{ hostvars[node].glusterfs_ip | default(hostvars[node].openshift.common.ip) }}" |