diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-29 16:02:50 +0100 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-31 11:04:49 +0100 |
| commit | a23f90f25130f11a7020aca1d8780c243732b00a (patch) | |
| tree | ddd0bfeba3213f9ca157047511a47b8763593856 | |
| parent | 1dc61697707d43435523a14dda5abe304b198b49 (diff) | |
| download | openshift-a23f90f25130f11a7020aca1d8780c243732b00a.tar.gz openshift-a23f90f25130f11a7020aca1d8780c243732b00a.tar.bz2 openshift-a23f90f25130f11a7020aca1d8780c243732b00a.tar.xz openshift-a23f90f25130f11a7020aca1d8780c243732b00a.zip | |
Make master schedulable
| -rw-r--r-- | roles/openshift_manage_node/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/config.yml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/roles/openshift_manage_node/defaults/main.yml b/roles/openshift_manage_node/defaults/main.yml index 00e04b9f2..b7a89a723 100644 --- a/roles/openshift_manage_node/defaults/main.yml +++ b/roles/openshift_manage_node/defaults/main.yml @@ -1,9 +1,5 @@ --- # 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) }}" - openshift_master_node_labels: node-role.kubernetes.io/master: 'true' diff --git a/roles/openshift_manage_node/tasks/config.yml b/roles/openshift_manage_node/tasks/config.yml index 4f00351b5..e5753d185 100644 --- a/roles/openshift_manage_node/tasks/config.yml +++ b/roles/openshift_manage_node/tasks/config.yml @@ -2,7 +2,7 @@ - name: Set node schedulability oc_adm_manage_node: node: "{{ openshift.node.nodename | lower }}" - schedulable: "{{ 'true' if l_openshift_manage_schedulable | bool else 'false' }}" + schedulable: "{{ 'true' if openshift_schedulable | default(true) | bool else 'false' }}" retries: 10 delay: 5 register: node_schedulable @@ -23,5 +23,5 @@ delegate_to: "{{ openshift_master_host }}" vars: l_node_labels: "{{ openshift_node_labels | default({}) }}" - l_master_labels: "{{ ('oo_masters_to_config' in group_names) | ternary(openshift_master_node_labels, {}) }}" + l_master_labels: "{{ openshift_manage_node_is_master | ternary(openshift_master_node_labels, {}) }}" l_all_labels: "{{ l_node_labels | combine(l_master_labels) }}" |