From c77390a23178f3b2cd310191d57b5c993b3bfbe3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 3 May 2018 18:01:25 +0000 Subject: [PATCH] try this a different way --- .../templates/cluster-inventory.j2 | 19 +++++++++++++++---- 1 file changed, 15 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 14a7382a18..13a6496c6d 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -811,7 +811,11 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} [nodes] {% for host in groups[openshift_cluster_masters_group] %} -{{ host }} {% if env == 'production' %}openshift_schedulable=False {% endif %} +{% if env == 'production' %} +{{ host }} openshift_schedulable=False +{% else %} +{{ host }} +{% endif %} {% endfor %} {% for host in groups[openshift_cluster_nodes_group] %} {{ host }} openshift_node_labels="{'region': 'infra', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" @@ -824,8 +828,11 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} {{ host }} openshift_node_labels="{'region':'infra'}" {% endfor %} {% for host in groups[openshift_cluster_masters_group] %} -{{ host }} {% if env == 'production' %}openshift_schedulable=False {% endif %} -{% endfor %} +{% if env == 'production' %} +{{ host }} openshift_schedulable=False +{% else %} +{{ host }} +{% endif %} {% for host in groups[openshift_cluster_nodes_group] %} {{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" {% endfor %} @@ -840,7 +847,11 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} {% endfor %} {% for host in groups[openshift_cluster_masters_group] %} -{{ host }} {% if env == 'production' %}openshift_schedulable=False {% endif %} +{% if env == 'production' %} +{{ host }} openshift_schedulable=False +{% else %} +{{ host }} +{% endif %} {% endfor %} {% for host in groups[openshift_cluster_nodes_group] %}