From 84877db42b1980e6267b24a7db76f1d46842615d Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 7 Aug 2019 13:03:44 +0200 Subject: [PATCH] OSBS: define the openshift_node_group_name in the correct place in the template Signed-off-by: Clement Verna --- .../templates/cluster-inventory.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 index 719a873c05..b9a14acadf 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -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 %}