infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

OSBS: define the openshift_node_group_name in the correct place in the template

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2019-08-07 13:03:44 +02:00 • committed by Pierre-Yves Chibon
parent 20e10de22b
commit 84877db42b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View file

@ -838,10 +838,10 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"}
[nodes]
{% for host in groups[openshift_cluster_masters_group] %}
{{ host }}
{{ host }} openshift_node_group_name='node-config-master'
{% endfor %}
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'infra', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}"
{{ host }} openshift_node_labels="{'region': 'infra', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" openshift_node_group_name='node-config-compute'
{% endfor %}
{% else %}
@ -851,10 +851,10 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"}
{{ host }} openshift_node_labels="{'region':'infra'}"
{% endfor %}
{% for host in groups[openshift_cluster_masters_group] %}
{{ host }} openshift_node_group_name='node-config-master'
{{ host }}
{% endfor %}
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" openshift_node_group_name='node-config-compute'
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}"
{% endfor %}
{% endif %}