Fix deployment of gluster with openshift AllInOne
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
(cherry picked from commit 87358befc0
)
This commit is contained in:
parent
1dfc4267f7
commit
d2e191e765
|
@ -115,11 +115,8 @@ outputs:
|
|||
copy:
|
||||
dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_glusterfs.yml"
|
||||
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:
|
||||
{% else -%}
|
||||
glusterfs:
|
||||
{% endif %}
|
||||
hosts:
|
||||
{% for host in groups[tripleo_role_name] | default([]) -%}
|
||||
{{ hostvars.raw_get(host)['ansible_hostname'] }}:
|
||||
|
@ -127,3 +124,14 @@ outputs:
|
|||
glusterfs_devices:
|
||||
{{openshift_gluster_disks | to_nice_yaml() | indent(8) }}
|
||||
{% 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 %}
|
||||
|
|
Loading…
Reference in New Issue