From b9010d93f61600364b37b7fda772bca71f0a6bd3 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 27 Nov 2017 16:15:28 -0500 Subject: remove schedulable from openshift_facts This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory. --- roles/openshift_manage_node/defaults/main.yml | 6 ++++++ roles/openshift_manage_node/tasks/main.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 roles/openshift_manage_node/defaults/main.yml (limited to 'roles/openshift_manage_node') diff --git a/roles/openshift_manage_node/defaults/main.yml b/roles/openshift_manage_node/defaults/main.yml new file mode 100644 index 000000000..f0e728a3f --- /dev/null +++ b/roles/openshift_manage_node/defaults/main.yml @@ -0,0 +1,6 @@ +--- +# openshift_manage_node_is_master is set at the play level. +openshift_manage_node_is_master: False + +# Default is to be schedulable except for master nodes. +l_openshift_manage_schedulable: "{{ openshift_schedulable | default(not openshift_manage_node_is_master) }}" diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index fbbac1176..247757ca9 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -37,7 +37,7 @@ - name: Set node schedulability oc_adm_manage_node: node: "{{ openshift.node.nodename | lower }}" - schedulable: "{{ 'true' if openshift.node.schedulable | bool else 'false' }}" + schedulable: "{{ 'true' if l_openshift_manage_schedulable | bool else 'false' }}" retries: 10 delay: 5 register: node_schedulable -- cgit v1.2.1