diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 10:31:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 10:31:30 -0500 |
| commit | c7645af60a5411af83b04fb6a5617887d3b39183 (patch) | |
| tree | c7164fe7b30a54d810ea4c23f43c89f73038284b /roles/openshift_manage_node | |
| parent | 192b8477faa018d31893b322f43f356ce3ac1c80 (diff) | |
| parent | b9010d93f61600364b37b7fda772bca71f0a6bd3 (diff) | |
| download | openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.gz openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.bz2 openshift-c7645af60a5411af83b04fb6a5617887d3b39183.tar.xz openshift-c7645af60a5411af83b04fb6a5617887d3b39183.zip | |
Merge pull request #6283 from mgugino-upstream-stage/schedulable
remove schedulable from openshift_facts
Diffstat (limited to 'roles/openshift_manage_node')
| -rw-r--r-- | roles/openshift_manage_node/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 2 |
2 files changed, 7 insertions, 1 deletions
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 |