openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix deployment of gluster with openshift AllInOne

Browse Source 
When TripleO deploys openshift with CNS, it configures it to setup
gluster for both the worker nodes and the image registry. However, the
code was incorrectly adding the glusterfs_registry group only for the
Infra node and was forgetting about the AllInOne role.

Closes-Bug: #1811334
Change-Id: Ib502a28db4d67434686a058562a37d1e1df3e263
This commit is contained in:
Martin André 2019-01-11 08:22:37 +01:00
parent 653856c58f
commit 87358befc0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extraconfig/services/openshift-cns.yaml
View File

@ -148,11 +148,8 @@ outputs:
copy: copy:
dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_glusterfs.yml" dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_glusterfs.yml"
content: | content: |
{% if tripleo_node_group_name == "node-config-infra" -%} {% if tripleo_node_group_name == "node-config-infra" or tripleo_node_group_name == 'node-config-all-in-one' -%}
glusterfs_registry: glusterfs_registry:
{% else -%}
glusterfs:
{% endif %}
hosts: hosts:
{% for host in groups[tripleo_role_name] | default([]) -%} {% for host in groups[tripleo_role_name] | default([]) -%}
{{ hostvars.raw_get(host)['ansible_hostname'] }}: {{ hostvars.raw_get(host)['ansible_hostname'] }}:
@ -160,3 +157,14 @@ outputs:
glusterfs_devices: glusterfs_devices:
{{openshift_gluster_disks | to_nice_yaml() | indent(8) }} {{openshift_gluster_disks | to_nice_yaml() | indent(8) }}
{% endfor %} {% endfor %}
{% endif %}
{% if tripleo_node_group_name != "node-config-infra" or tripleo_node_group_name == 'node-config-all-in-one'-%}
glusterfs:
hosts:
{% for host in groups[tripleo_role_name] | default([]) -%}
{{ hostvars.raw_get(host)['ansible_hostname'] }}:
glusterfs_ip: {{hostvars.raw_get(host)['storage_ip']}}
glusterfs_devices:
{{openshift_gluster_disks | to_nice_yaml() | indent(8) }}
{% endfor %}
{% endif %}