openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix deployment of gluster with openshift AllInOne"

Browse Source
This commit is contained in:
Zuul 2019-02-07 06:48:09 +00:00 committed by Gerrit Code Review
commit 94203f0447
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

@ -115,11 +115,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'] }}:
@ -127,3 +124,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 %}