From b40580b2e3e9737a78eb065c28e6de7bf9334258 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 31 May 2018 21:40:14 +0000 Subject: [PATCH] you cannot have these be openshift_schedulable=False in 3.9 --- .../templates/cluster-inventory.j2 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 index cc7dcdd32b..530b05f561 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -838,11 +838,7 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} [nodes] {% for host in groups[openshift_cluster_masters_group] %} -{% 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'}" @@ -855,11 +851,7 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} {{ host }} openshift_node_labels="{'region':'infra'}" {% endfor %} {% for host in groups[openshift_cluster_masters_group] %} -{% if env == 'production' %} -{{ host }} openshift_schedulable=False -{% else %} {{ host }} -{% endif %} {% endfor %} {% for host in groups[openshift_cluster_nodes_group] %} {{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" @@ -875,11 +867,7 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"} {% endfor %} {% for host in groups[openshift_cluster_masters_group] %} -{% if env == 'production' %} -{{ host }} openshift_schedulable=False -{% else %} {{ host }} -{% endif %} {% endfor %} {% for host in groups[openshift_cluster_nodes_group] %}